收支单caller，销售出货退货日志记录优化

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

@@ -38,7 +38,13 @@ public enum  BillCodeSeq {
 
     RECBALANCE("收款单", "RecBalance"),
 
-    VERIFICATION("核价单", "Verification");
+    VERIFICATION("核价单", "Verification"),
+
+    OTHRECEIPTS("其它收入单","OthReceipts"),
+
+    OTHSPENDINGS ("其它支出单","OthSpendings"),
+
+    FUNDTRANSFER ("资金转存","FundTransfer");
 
     BillCodeSeq(String name, String caller) {
         this.name = name;

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

@@ -122,7 +122,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             if (insertDetails.size()>0) {
                 prodIODetailMapper.batchInsert(insertDetails);
             }
-            baseDTO = getBaseDTOById(pi_id,pi_class);
+            baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
             //更新明细金额
             getTotal(pi_id,pi_class);
             //日志记录
@@ -151,7 +151,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         if (updateDetails.size()>0) {
             prodIODetailMapper.batchUpdate(updateDetails);
         }
-        baseDTO = getBaseDTOById(pi_id,pi_class);
+        baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
         //更新已转数
         updateYqty(prodInOut);
         return baseDTO;
@@ -169,7 +169,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodIODetailMapper.deleteByForeignKey(id);
         //主表删除
         prodInOutMapper.deleteByPrimaryKey(id);
-        DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class());
+        DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         //更新已转数
         updateYqty(prodInOut);
         //日志
@@ -188,7 +188,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                 id = baseDTO.getId();
             }
             String res = singleAudit(formData.getMain());
-            if(res!=null){
+            if(StringUtils.hasText(res)){
                 new BizException(501,res);
             }
         }
@@ -197,19 +197,21 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     }
     private String singleAudit(ProdInOutDTO prodInOutDTO) {
         String pi_class= prodInOutDTO.getPi_class();
+        String pi_inoutno = prodInOutDTO.getPi_inoutno();
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("inoutNo",prodInOutDTO.getPi_inoutno() );
+        map.put("inoutNo",pi_inoutno);
         map.put("class", pi_class);
         map.put("commitid",BaseContextHolder.getUserId());
         map.put("companyid",BaseContextHolder.getCompanyId());
         map.put("result","");
         warehouseApi.post(map);
         Object result =  map.get("result");
+        System.out.println("result:"+result);
         if(result!=null){
             return result.toString();
         }else{
             //记录日志
-            DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class);
+            DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
             messageLogService.audit(docBaseDTO);
             return "";
@@ -232,9 +234,10 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }
     }
     private String singleUnAudit(ProdInOutDTO prodInOutDTO) {
-        String pi_class= prodInOutDTO.getPi_class();
+        String pi_class = prodInOutDTO.getPi_class();
+        String  pi_inoutno = prodInOutDTO.getPi_inoutno();
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("inoutNo",prodInOutDTO.getPi_inoutno() );
+        map.put("inoutNo", pi_inoutno);
         map.put("class", pi_class);
         map.put("commitid",BaseContextHolder.getUserId());
         map.put("companyid",BaseContextHolder.getCompanyId());
@@ -252,7 +255,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             prodInOut.setUpdaterId(BaseContextHolder.getUserId());
             getMapper().updateByPrimaryKeySelective(prodInOut);
             //记录日志
-            DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class);
+            DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
             messageLogService.unAudit(docBaseDTO);
             return "";
@@ -311,7 +314,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         Integer num = prodIODetailMapper.deleteByPrimaryKey(id);
         //更新已转数
         updateYqty(prodInOut);
-        DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class());
+        DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         //日志
        messageLogService.deleteDetail(docBaseDTO);
         return num;
@@ -473,7 +476,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
 
         prodInOutMapper.updateByPrimaryKeySelective(prodInOut);
         //记录日志
-        DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class());
+        DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class(),prodInOut.getPi_inoutno());
        messageLogService.close(docBaseDTO);
         return "";
     }
@@ -518,7 +521,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOut.setPi_statuscode(Status.AUDITED.getDisplay());
         prodInOutMapper.updateByPrimaryKeySelective(prodInOut);
         //记录日志
-        DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class());
+        DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         messageLogService.open(docBaseDTO);
         return "";
     }
@@ -591,12 +594,11 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
      * @Author: wuyx
      * @Date: 2018/10/25
      */
-    private DocBaseDTO getBaseDTOById(Long id,String pi_class) {
+    private DocBaseDTO getBaseDTOById(Long id,String pi_class,String code) {
         if (null == id) {
             return null;
         }
         String caller = BillCodeSeq.SALEIN.getName().equals(pi_class)?BillCodeSeq.SALEIN.getCaller():BillCodeSeq.SALEOUT.getCaller();
-        String code = prodInOutMapper.selectCodeById(id);
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setId(id);
         baseDTO.setCode(code);