托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -255,7 +255,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 	  QueryWrapper<SyPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPackingList, request.getParameterMap());
 	  if(tailoringOrFabric.equals("0")){ //查成衣
-		  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.the_documents_state",1);
+		  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1);
 		  queryWrapper.groupBy("a.document_No");
 		  pageList = syShippingOrderService.queryTailoring(page,queryWrapper);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java

@@ -417,6 +417,8 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
             saveJson.put("CHANDLER",map.get("cHandler"));
             saveJson.put("CDEFINE13",map.get("cOrderCode"));
             saveJson.put("CGLTYPE",map.get("cSource"));
+            saveJson.put("CDEFINE10",map.get("cOrderCode"));
+
             //子表
             if(itemList!=null){
                 JSONArray itemJsonArray=new JSONArray();
@@ -609,6 +611,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         itemMap.put("iTaxPrice",mapPOPodetails.get("iNatTax"));
         itemMap.put("iSum",mapPOPodetails.get("iNatSum"));
         itemMap.put("bTaxCost",mapPOPodetails.get("bTaxCost"));
+        itemMap.put("iMoney","0");
     }
 
     //获取批次属性赋值