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

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

@@ -59,7 +59,16 @@ public enum Operation {
     /**
      * 反记账
      */
-    UNENDPRODUCT("msg.unEndProduct", "msg.unEndProductSuccess");
+    UNENDPRODUCT("msg.unEndProduct", "msg.unEndProductSuccess"),
+    /**
+     * 转出货单
+     */
+    TURNPRODOUT("msg.turnProdIO","msg.turnSuccess"),
+
+    /**
+     * 转销售验退单
+     */
+    TURNPRODOUTRETURN("msg.turnProdIOReturn","msg.turnSuccess");
 
     private final String title;
     private final String result;

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

@@ -92,6 +92,7 @@ msg.turnARBill=\u5f00\u7968\u4f5c\u4e1a
 msg.turnNotify=\u8f6c\u901a\u77e5\u5355\u64cd\u4f5c
 msg.turnStorage=\u8f6c\u5165\u5e93
 msg.turnProdIO=\u8f6c\u51fa\u5e93\u5355\u64cd\u4f5c
+msg.turnProdIOReturn=\u8F6C\u9500\u552E\u9A8C\u9000\u5355
 msg.turnProdIO\!OtherOut=\u8f6c\u5176\u5b83\u51fa\u5e93\u5355\u64cd\u4f5c
 msg.turnProdIO\!OtherPurcOut=\u8f6c\u5176\u5b83\u91c7\u8d2d\u51fa\u5e93\u5355
 msg.turnSendNotify=\u8f6c\u53d1\u8d27\u901a\u77e5\u5355\u64cd\u4f5c

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

@@ -11,6 +11,7 @@ import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
+import com.usoftchina.saas.commons.po.Operation;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.api.WarehouseApi;
@@ -166,7 +167,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //更新明细金额等
         setTotal(prodInOutNow);
         //日志
-        messageLogService.update(baseDTO);
+       messageLogService.update(baseDTO);
         return baseDTO;
 
     }
@@ -191,7 +192,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //更新明细金额等
         setTotal(prodInOut);
         //日志
-       messageLogService.deleteDetail(docBaseDTO);
+      messageLogService.deleteDetail(docBaseDTO);
     }
 
     @Override
@@ -203,7 +204,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         setTotal(prodInOut);
         DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         //日志
-        messageLogService.deleteDetail(docBaseDTO);
+       messageLogService.deleteDetail(docBaseDTO);
         return num;
     }
 
@@ -238,6 +239,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             singleAudit( formData.getMain());
         }
         baseDTO.setId(id);
+        baseDTO.setCode(formData.getMain().getPi_inoutno());
         return baseDTO;
     }
     private void singleAudit(ProdInOutDTO prodInOutDTO) {
@@ -251,18 +253,17 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         map.put("inoutNo",pi_inoutno);
         map.put("class", pi_class);
         map.put("commitid",BaseContextHolder.getUserId());
-        map.put("companyid",BaseContextHolder.getCompanyId());
+        map.put("companyId",BaseContextHolder.getCompanyId());
         map.put("result","");
         Result res = warehouseApi.post(map);
-        Object result =  res.getData();
-        System.out.println("result:"+result);
+        Object result = res.getData();
         if(!StringUtils.isEmpty(result)){
             throw new BizException(BizExceptionCode.SALEOUT_POST_ERROR.getCode(),result.toString());
         }else{
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
-            messageLogService.audit(docBaseDTO);
+           messageLogService.audit(docBaseDTO);
         }
     }
     @Override
@@ -304,7 +305,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         map.put("inoutNo", pi_inoutno);
         map.put("class", pi_class);
         map.put("commitid",BaseContextHolder.getUserId());
-        map.put("companyid",BaseContextHolder.getCompanyId());
+        map.put("companyId",BaseContextHolder.getCompanyId());
         map.put("result","");
         Result res = warehouseApi.unPost(map);
         Object result =  res.getData();
@@ -374,6 +375,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         Integer count=0;
         double pdOutqty=0;
         double pdYqty=0;
+        double pdSendPrice = 0.0;
+        double pdTaxrate = 0.0;
         ProdInOut sourcePi = checkAndReturnOrder(id);
         List<ProdIODetail> sourceDetails =prodIODetailMapper.selectByFK(id);
         if (null == sourcePi || StringUtils.isEmpty(sourcePi.getPi_inoutno()) || sourceDetails.size() == 0) {
@@ -401,7 +404,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //插入销售退货单主表
         ProdInOut targetPi = new ProdInOut();
         //生成单号
-        String piInoutno = maxnumberService.getMaxnumber(BillCodeSeq.SALEIN.getCaller(),true).getData();
+        String piInoutno  = maxnumberService.getMaxnumber(BillCodeSeq.SALEIN.getCaller(),true).getData();
+                //BillCodeSeq.SALEIN.getCaller()+Math.abs(Math.random()*100);
+
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
         targetPi.setCreateTime(new Date());
@@ -430,6 +435,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             ProdIODetail targetPid = new ProdIODetail();
             pdOutqty = sourcePid.getPd_outqty()==null?0.0:sourcePid.getPd_outqty();
             pdYqty = sourcePid.getPd_yqty()==null?0.0:sourcePid.getPd_yqty();
+            pdSendPrice = sourcePid.getPd_sendprice()==null?0.0:sourcePid.getPd_sendprice();
+            pdTaxrate = sourcePid.getPd_taxrate()==null?0.0:sourcePid.getPd_taxrate();
             if(pdOutqty-pdYqty>0){
                 //公司id
                 targetPid.setCompanyId(sourcePid.getCompanyId());
@@ -443,7 +450,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                 targetPid.setPd_orderdetno(sourcePid.getPd_orderdetno());
 
                 targetPid.setPd_sdid(sourcePid.getPd_sdid());
-                targetPid.setPd_sendprice(sourcePid.getPd_sendprice());
+                targetPid.setPd_sendprice(pdSendPrice);
+                targetPid.setPd_taxrate(pdTaxrate);
 
 
                 targetPid.setPd_prodid(sourcePid.getPd_prodid());
@@ -454,6 +462,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
 
                 //本次转单数
                 targetPid.setPd_inqty(pdOutqty-pdYqty);
+                targetPid.setPd_total((pdOutqty-pdYqty)*pdSendPrice);
+                targetPid.setPd_nettotal((pdOutqty-pdYqty)*(pdSendPrice/(1+pdTaxrate/100)));
                 prodIODetailMapper.insertSelective(targetPid);
                 //更新已转数
                 sourcePid.setPd_yqty(pdOutqty);
@@ -461,9 +471,12 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             }
         }
 
+        //更新明细金额等
+        setTotal(targetPi);
+
         //日志记录
-        DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.SALEIN.getCaller());
-        //messageLogService.customizeLog(baseDTO, Operation.);
+        DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.SALEIN.getName());
+        messageLogService.customizeLog(baseDTO, Operation.TURNPRODOUTRETURN);
         return baseDTO;
 
     }

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

@@ -476,7 +476,7 @@ public class SaleServiceImpl implements SaleService{
         prodIODetailMapper.updatePDSaleOut(pi_id);
         //日志记录
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, pi_inoutno, BillCodeSeq.SALEOUT.getName());
-        //messageLogService.customizeLog(baseDTO, Operation.);
+        messageLogService.customizeLog(baseDTO, Operation.TURNPRODOUT);
         return baseDTO;
     }
 

applications/sale/sale-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -539,9 +539,10 @@
     </foreach>
   </select>
   <update id="updatePiTotal"  parameterType="long">
-   update ProdInOut SET
-   pi_total = round(IFNULL((SELECT sum(round(pd_total,2)) FROM ProdIODetail WHERE pd_piid=pi_id),0),2)
-   where pi_id = #{id}
+update ProdInOut SET
+		 pi_total = ( select IFNULL(sum(IFNULL(pd_total,0)),0) FROM ProdIODetail WHERE pd_piid=#{id}),
+		 pi_nettotal = ( select IFNULL(sum(IFNULL(pd_nettotal,0)),0) FROM ProdIODetail WHERE pd_piid=#{id})
+			where pi_id =#{id}
   </update>
 
 </mapper>

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/window/MessageBox.js

@@ -0,0 +1,10 @@
+Ext.define('Ext.locale.zh_CN.window.MessageBox', {
+    override: 'Ext.window.MessageBox',
+
+    buttonText: {
+        ok: 'OK',
+        yes: '是',
+        no: '否',
+        cancel: '取消'
+    }
+});