发运明细

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -110,7 +110,7 @@ ${ew.customSqlSegment}
           from sy_shipping_details_item a
           left join sy_order_data_item b
           on a.sy_order_data_item_id = b.id
-          where del_flag = 0 and shipping_details_id = #{shippingDetailsId}
+          where a.del_flag = 0 and a.shipping_details_id = #{shippingDetailsId}
     </select>
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -71,21 +72,13 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
          String id = oConvertUtils.id();
          //设置ID
          syShippingDetails.setId(id);
-         //获取最新单据号
-//         QueryWrapper<SyShippingDetails> queryWrapper = new QueryWrapper<>();
-//         queryWrapper.eq("del_flag",0).orderByDesc("document_no").last("limit 0,1");
-//         List<SyShippingDetails> documentNoList = list(queryWrapper);
-//         if(documentNoList.size()==0){
-//             syShippingDetails.setDocumentNo("1");
-//         }else{
-//             if(oConvertUtils.isEmpty(syId)){
-//                 int codeno = Integer.parseInt(syShippingDetails.get(0).getDocumentNo());
-//                 Integer documentNo = codeno+1;
-//                 syShippingDetails.setDocumentNo(documentNo.toString());//单据号
-//             }
-             syShippingDetails.setState("0");//状态
-        // }
-
+         //设置单据号（F2206201305854）
+        if(oConvertUtils.isEmpty(syId)){
+        SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmSS");
+        String createTime = sf.format(new Date());
+        syShippingDetails.setDocumentNo("F"+createTime);
+        syShippingDetails.setState("0");//状态
+        }
          //新增子表
         List<SyShippingDetailsItem> list = syShippingDetails.getSyShippingDetailsItemList();