action_cancel, action_done行为更新

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions/service/Purchase_requisitionExService.java

@@ -56,10 +56,8 @@ public class Purchase_requisitionExService extends Purchase_requisitionServiceIm
         List<Purchase_requisition_line> lines = purchaseRequisitionLineService.selectByRequisitionId(et.getId());
         if(lines.size() != 0){
             for(Purchase_requisition_line line : lines){
-                //移除 line 关联 supplierinfo,从Product_supplierinfo中删除相关的记录
-                // 调用的时models.py中的unlink()方法，从Product_supplierinfo表中将采购申请所对应的供应商价格记录删除
-                // unlink() 作用是删除当前表中的采购申请行对应的供应商价格记录
-
+                //移除 line 关联 supplierinfo,从Product_supplierinfo表中将采购申请所对应的供应商价格记录删除
+                supplierinfoService.removeByPurchaseRequisitionLineId(line.getRequisitionId());
             }
         }
         // 取消采购申请所对应的采购订单
@@ -68,7 +66,7 @@ public class Purchase_requisitionExService extends Purchase_requisitionServiceIm
             purchaseOrderService.button_cancel(order);
             // 本采购申请单相关的采购询价单已取消
         }
-        log.warn("purchase_order");
+//        log.warn("purchase_order");
 
         et.setState(StaticDict.PURCHASE_REQUISITION__STATE.CANCEL.getValue());
         this.update(et);
@@ -96,11 +94,10 @@ public class Purchase_requisitionExService extends Purchase_requisitionServiceIm
         //移除 line 关联 supplierinfo,从Product_supplierinfo中删除相关的记录
         if(lines.size() != 0){
             for(Purchase_requisition_line line : lines){
-                // 需要调用product.supplierinfo模型中的unlink()方法，未处理
-                // unlink() 作用是删除当前表中的采购申请行对应的供应商价格记录
+                supplierinfoService.removeByPurchaseRequisitionLineId(line.getRequisitionId());
             }
         }
-        log.warn("移除 line 关联 supplierinfo");
+//        log.warn("移除 line 关联 supplierinfo");
 
         et.setState(StaticDict.PURCHASE_REQUISITION__STATE.DONE.getValue());
         this.update(et);
@@ -158,12 +155,13 @@ public class Purchase_requisitionExService extends Purchase_requisitionServiceIm
                     supplierinfo.setPrice(line.getPriceUnit());
                     supplierinfo.setCurrencyId(purchaseRequisition.getCurrencyId());
                     supplierinfo.setPurchaseRequisitionLineId(line.getId());
-                    // 设置不能为空的值为默认值，sequence,minqty,
+                    // 设置不能为空的值为默认值，sequence,minqty,delay
                     supplierinfo.setSequence(1);
                     supplierinfo.setMinQty(0.0);
+                    supplierinfo.setDelay(1);
                     supplierinfoService.create(supplierinfo);
                 }
-                log.warn("关联 create_supplier_info");
+//                log.warn("关联 create_supplier_info");
             }
             et.setState(StaticDict.PURCHASE_REQUISITION__STATE.ONGOING.getValue());
         } else {