采购模块转单日志

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Operation.java

@@ -65,12 +65,12 @@ public enum Operation {
     /**
      * 转采购验收单
      */
-    PURCHASEIN("msg.TurnPurcCheckin", "msg.TurnPurcCheckinSuccess"),
+    PURCHASEIN("msg.turnPurcCheckin", "msg.turnPurcCheckinSuccess"),
 
     /**
      * 转采购验退单
      */
-    PURCHASEOUT("msg.TurnPurcCheckout", "msg.TurnPurcCheckoutSuccess"),
+    PURCHASEOUT("msg.turnPurcCheckout", "msg.turnPurcCheckoutSuccess"),
 
     /**
      * 转出货单

applications/commons/commons-server/src/main/resources/i18n/messages_zh_CN.properties

@@ -119,4 +119,8 @@ msg.getSuccess=\u83b7\u53d6\u6210\u529f
 msg.endProdudct=\u7ed3\u8d26\u64cd\u4f5c
 msg.endProdudctSuccess=\u7ed3\u8d26\u6210\u529f
 msg.unEndProduct=\u53cd\u7ed3\u8d26\u64cd\u4f5c
-msg.unEndProductSuccess=\u53cd\u7ed3\u8d26\u6210\u529f
+msg.unEndProductSuccess=\u53cd\u7ed3\u8d26\u6210\u529f
+msg.turnPurcCheckin=\u8F6C\u6570\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C
+msg.turnPurcCheckinSuccess=\u8F6C\u6570\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C\u6210\u529F
+msg.turnPurcCheckout=\u8F6C\u91C7\u8D2D\u9A8C\u9000\u5355\u64CD\u4F5C
+msg.turnPurcCheckoutSuccess=\u8F6C\u91C7\u8D2D\u9A8C\u9000\u5355\u64CD\u4F5C\u6210\u529F

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

@@ -501,12 +501,11 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  prodIODetailMapper.updateByPrimaryKeySelective(sourcePid);
              }
          }
-        //更新默认仓库
-//        getDefaultWarehouseByProduct(pi_id);
         //采购验退单相关计算
         calcProdInout(pi_id,"采购验退单");
+        DocBaseDTO baselog = new DocBaseDTO(sourcePi.getId(), sourcePi.getPi_inoutno(), BillCodeSeq.PURCHASEIN.getCaller());
+        messageLogService.customizeLog(baselog, Operation.PURCHASEOUT);
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.PURCHASEOUT.getName());
-        messageLogService.customizeLog(baseDTO, Operation.PURCHASEOUT);
         return Result.success(baseDTO);
     }
 

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

@@ -488,8 +488,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
         //采购验收单相关计算
         prodInOutService.calcProdInout(pi_id,"采购验收单");
+        //日志记录到采购单
+        DocBaseDTO baselog = new DocBaseDTO(purchase.getId(), purchase.getPu_code(), BillCodeSeq.PURCHASE.getCaller());
+        messageLogService.customizeLog(baselog, Operation.PURCHASEIN);
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.PURCHASEIN.getName());
-        messageLogService.customizeLog(baseDTO, Operation.PURCHASEIN);
         return Result.success(baseDTO);
     }