Merge remote-tracking branch 'origin/tl'

src/main/java/com/aps/service/Algorithm/MaterialRequirementService.java

@@ -1038,7 +1038,7 @@ if(headers1==null)
         orderMaterial.setOperationId(operation.getId());
         orderMaterial.setChildOrderId(StringUtils.isBlank(childorderId) ? orderId : childorderId);
         orderMaterial.setRequiredQuantity(allneeded);
-
+        orderMaterial.setQjQty(allneeded);
         double availableNow = material.getCurrentStock();
         orderMaterial.setMaterialCode(material.getCode());
         orderMaterial.setMaterialName(material.getName());
@@ -1085,6 +1085,7 @@ if(headers1==null)
         orderMaterial.setCheckLeadTime(0);
         orderMaterial.setPurchaseTime(0);
         orderMaterial.setRequiredQuantity(need);
+        orderMaterial.setQjQty(need);
         orderMaterial.setSpentQty(spentQty);
         orderMaterial.setMainQty(mainQty);
         orderMaterial.setQuantity(qty);