Merge remote-tracking branch 'origin/main'

nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/strategy/core/impl/DealLLDBBillPmDeamndCallBack.java

@@ -62,10 +62,9 @@ public class DealLLDBBillPmDeamndCallBack implements CallbackStrategy {
         if (region==null){
             throw new BadRequestException("当前产线未配置对应仓库编码getPoint_type_explain");
         }
+        one.setAssign_qty(param.getAssign_qty());
         if (one.getAssign_qty().intValue()>=one.getQty().intValue()){
-            one.setAssign_qty(param.getAssign_qty());
             one.setStatus(DemandStatus.FINISH.getValue());
-            this.iPmDemandService.updateById(one);
             final String now = DateUtil.now();
             JSONObject callbackData = new JSONObject();
             callbackData.put("method", "DealLLDBBill");
@@ -106,5 +105,6 @@ public class DealLLDBBillPmDeamndCallBack implements CallbackStrategy {
                     param.getAssign_qty().toString())));
             iPmStockReturnService.save(stockReturn);
         }
+        this.iPmDemandService.updateById(one);
     }
 }