导入

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabricItem.java

@@ -413,9 +413,13 @@ public class SyPackingListFabricItem implements Serializable {
 		BigDecimal gramWeight2=new BigDecimal("0");
 		if(width!=null&&!width.equals("")){
 			width1=new BigDecimal(width);
+		}else{
+			width="0";
 		}
 		if(gramWeight!=null&&!gramWeight.equals("")){
 			gramWeight2=new BigDecimal(gramWeight);
+		}else{
+			gramWeight="0";
 		}
 		BigDecimal num=new BigDecimal("100000");
 		if(netWeight.doubleValue()>0&&width1.doubleValue()>0&&gramWeight2.doubleValue()>0){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -128,7 +128,16 @@
     <select id="getOM_MOMaterials" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         select * from OM_MOMaterials where
                     MoDetailsID = ${map.MODetailsID }
-                    AND  cFree2 =  #{map.cFree2}
+        <if test="map.cFree1!=null"> AND  cFree1 =  #{map.cFree1} </if>
+        <if test="map.cFree2!=null"> AND  cFree2 =  #{map.cFree2} </if>
+        <if test="map.cFree3!=null"> AND  cFree3 =  #{map.cFree3} </if>
+        <if test="map.cFree4!=null"> AND  cFree4 =  #{map.cFree4} </if>
+        <if test="map.cFree5!=null"> AND  cFree5 =  #{map.cFree5} </if>
+        <if test="map.cFree6!=null"> AND  cFree6 =  #{map.cFree6} </if>
+        <if test="map.cFree7!=null"> AND  cFree7 =  #{map.cFree7} </if>
+        <if test="map.cFree8!=null"> AND  cFree8 =  #{map.cFree8} </if>
+        <if test="map.cFree9!=null"> AND  cFree9 =  #{map.cFree9} </if>
+        <if test="map.cFree10!=null"> AND  cFree10 =  #{map.cFree10} </if>
     </select>
             <!--
                     AND isnull(cFree2,'') = isnull(#{map.cFree2},'')

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -655,15 +655,19 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 								BigDecimal netWeight=item.getNetWeight();//净重
 								BigDecimal gramWeight=new BigDecimal(item.getGramWeight());//克重
 								BigDecimal width=new BigDecimal(item.getWidth());//门幅
-								BigDecimal meter=netWeight.multiply(gramWeight).multiply(width).divide(new BigDecimal("100000"));//米数
-								item.setMeter(meter);//米数
+								if(gramWeight.intValue()==0||width.intValue()==0||netWeight.intValue()==0){
+
+								}else{
+									BigDecimal meter=netWeight.multiply(gramWeight).multiply(width).divide(new BigDecimal("100000"));//米数
+									item.setMeter(meter);//米数
+								}
 							}
 
 							if(item!=null&&item.getMasterMetering().equals("KG")){//KG
 								item.setTotalPrice(item.getNetWeight().multiply(item.getPrice()));//净重*单价
 							}else if(item!=null&&item.getMasterMetering().equals("M")){//M
 								if(item.getMeter()==null){
-									throw new JeecgBootException("净重、门幅、克重之间有值为空,无法获取米数计算总价");
+									throw new JeecgBootException("净重、门幅、克重之间有值为空,无法计算米数");
 								}
 								item.setTotalPrice(item.getMeter().multiply(item.getPrice()));//米数*单价
 							}else if(item.getActualDeclaredQuantity()!=null){//其他
@@ -884,7 +888,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}else{//委外订单子表数据  顺序---2
 					//第二次怎么获取采购订单的子表id	查询销售订单子表保存行号去绑定上游的账套
 					orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("OM_MODetails", "MODetailsID='"+item.getOmpoIdItem()+"'","MODetailsID");
-					System.out.println("orderDataItem\n"+orderDataItem);
 					Map<String,Object> orderDataItem2=purchaseWarehousingMapper.getOMMoDetails(item.getOmpoIdItem());//获取自由项
 					getcFree(mapItem,orderDataItem2);
 					getcFree(mapItem5,orderDataItem2);
@@ -896,7 +899,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					System.out.println("orderDataItem2\n"+orderDataItem2);
 					Map<String,Object> orderDataItem3 =syPackingListFabricMapper.getOM_MOMaterials(orderDataItem2);//委外订单子表
 					System.out.println("orderDataItem3\n"+orderDataItem3);
-					System.out.println("orderDataItem3\t"+orderDataItem3.size());
+					System.out.println("orderDataItem3.size\t"+orderDataItem3.size());
 					/*for (Map<String,Object> stringObjectMap : orderDataItem3){
 						mapItem2.put("AUTOID_ALL",stringObjectMap.get("MOMaterialsID"));//关联明细ID
 					}*/
@@ -1000,7 +1003,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			mapList5.add(map5);
 			map6.put("DETAILList",mapItems6);//明细集合
 			mapList6.add(map6);
-
 			if(mapt.get("customerCode").equals("T020001")&&!mapt.get("account").equals("901")){
 				mapt.put("account","901");//账套号
 			}else if(mapt.get("customerCode").equals("0001")&&!mapt.get("account").equals("902")){