Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/ProdIODetailMapper.java

@@ -31,7 +31,7 @@ public interface ProdIODetailMapper extends CommonBaseMapper<ProdIODetail> {
 
     void deleteByFK(Long id);
 
-    void calcProdIn(@Param("pi_id") Long pi_id,@Param("pi_class") String pi_class);
+    void calcProdIn(@Param("pi_id") Long pi_id);
 
-    void calcProdOut(@Param("pi_id") Long pi_id,@Param("pi_class") String pi_class);
+    void calcProdOut(@Param("pi_id") Long pi_id);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/ProdInOutService.java

@@ -74,6 +74,7 @@ public interface ProdInOutService extends CommonBaseService<ProdInOutMapper, Pro
 
     void batchOpen(BatchDealBaseDTO baseDTOs);
 
-    void updateYqty(ProdInOut prodInOut);
+
+    void calcProdInout(Long pi_id, String pi_class);
 
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -350,11 +350,11 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     }
 
 
-    private void calcProdInout(Long pi_id, String pi_class) {
+    public void calcProdInout(Long pi_id, String pi_class) {
         if ("采购验收单".equals(pi_class)) {
-            prodIODetailMapper.calcProdIn(pi_id,pi_class);
+            prodIODetailMapper.calcProdIn(pi_id);
         } else if ("采购验退单".equals(pi_class)) {
-            prodIODetailMapper.calcProdOut(pi_id,pi_class);
+            prodIODetailMapper.calcProdOut(pi_id);
         }
     }
 
@@ -401,7 +401,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setPi_pucode(sourcePi.getPi_pucode());
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
-        targetPi.setCreatorId(sourcePi.getCreatorId());
         targetPi.setCreateTime(new Date());
 
 
@@ -409,7 +408,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         getMapper().insertSelective(targetPi);
         //插入验退单从表
         long pi_id = targetPi.getId();
-        for (int i = 1;i<=sourcePids.size();i++){
+        for (int i = 0;i<sourcePids.size();i++){
              ProdIODetail sourcePid = sourcePids.get(i);
              ProdIODetail targetPid = new ProdIODetail();
              pdInqty = sourcePid.getPd_inqty()==null?0:sourcePid.getPd_inqty();
@@ -419,7 +418,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  targetPid.setPd_piid(pi_id);
                  targetPid.setPd_inoutno(piInoutno);
                  targetPid.setPd_piclass(BillCodeSeq.PURCHASEOUT.getName());
-                 targetPid.setPd_pdno(i);
+                 targetPid.setPd_pdno(i+1);
                  targetPid.setPd_orderid(sourcePid.getPd_orderid());
                  targetPid.setPd_ordercode(sourcePid.getPd_ordercode());
                  targetPid.setPd_orderdetno(sourcePid.getPd_orderdetno());
@@ -442,7 +441,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
          }
 
         //采购验退单相关计算
-        updateYqty(targetPi);
+        calcProdInout(pi_id,"采购验退单");
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setId(pi_id);
         baseDTO.setCode(piInoutno);

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -413,7 +413,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         prodInOut.setPi_puid(purchase.getId().intValue());
         prodInOut.setPi_pucode(purchase.getPu_code());
         prodInOut.setCompanyId(purchase.getCompanyId());
-        prodInOut.setCreatorId(purchase.getCreatorId());
         prodInOut.setCreateTime(new Date());
 
 
@@ -425,7 +424,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //插入验收单从表
         long pi_id = prodInOut.getId();
 
-        for (int i=1;i<=purchaseDetails.size();i++){
+        for (int i=0;i<purchaseDetails.size();i++){
             PurchaseDetail purchaseDetail =purchaseDetails.get(i);
             ProdIODetail prodIODetail = new ProdIODetail();
             pdQty = purchaseDetail.getPd_qty()==null?0:purchaseDetail.getPd_qty();
@@ -435,7 +434,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 prodIODetail.setPd_piid(pi_id);
                 prodIODetail.setPd_inoutno(piInoutno);
                 prodIODetail.setPd_piclass("采购验收单");
-                prodIODetail.setPd_pdno(i);
+                prodIODetail.setPd_pdno(i+1);
                 prodIODetail.setPd_orderid(purchaseDetail.getId().intValue());
                 prodIODetail.setPd_ordercode(purchase.getPu_code());
                 prodIODetail.setPd_orderdetno(purchaseDetail.getPd_detno());
@@ -456,7 +455,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             }
         }
         //采购单相关计算
-        prodInOutService.updateYqty(prodInOut);
+        prodInOutService.calcProdInout(pi_id,"采购验收单");
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setId(pi_id);
         baseDTO.setCode(piInoutno);