Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -274,8 +274,8 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
 //                "    ) b on r.cBatch = b.cBatch and b.cInvCode=r.cInvCode " +
 //                "  GROUP BY c.cInvName,r.cBatch,b.cSource,b.cPOID,v.cVenName ) as ta GROUP BY cInvName,processUnit";
 
-        String sqlIngredient ="SELECT cInvName as goodsName,sum(yi) as usageQuantity,sum(ying) as planQuantity,sum(gou) as purchaseQuantity," +
-                "processUnit,sum(gou)-sum(yuu) as fabricremainingQuantity,sum(yu) as fabrictransferQuantity FROM (  " +
+        String sqlIngredient ="SELECT cInvName as goodsName,sum(yi) as usageQuantity,sum(gou) as purchaseQuantity," +
+                "processUnit,sum(gou)-sum(yuu) as ingredientsRemainingQuantity,sum(yu) as ingredientsTransferQuantity FROM (  " +
                 " " +
                 "                select sum(r.iQuantity) as yu,r.cBatch ,b.cSource,b.cPOID,sum(b.gou) as gou,sum(b.yi) as yi,sum(b.ying) as ying " +
                 "    ,c.cInvName ,v.cVenName as processUnit ,( " +

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

@@ -28,7 +28,6 @@ import org.jeecg.modules.documents.seclarationElements.service.impl.SyDeclaratio
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem;
-import org.jeecg.modules.documents.syShippingOrder.entity.VO.ElmentReady;
 import org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList;
 import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper;
 import org.jeecg.modules.documents.syShippingOrder.service.ISyShippingOrderService;