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/service/impl/PurchaseServiceImpl.java

@@ -510,6 +510,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setPu_acceptstatuscode(Status.UNAUDITED.name());
         purchase.setUpdateTime(new Date());
         purchase.setUpdaterId(BaseContextHolder.getUserId());
+        getMapper().updateByPrimaryKey(purchase);
         //更新存在字段
         //日志
         messageLogService.audit(docBaseDTO);

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java

@@ -70,4 +70,8 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
     private String pi_remark;
 
     private Long pi_ioid;
+
+    private String pi_macode;
+
+    private Long pi_maid;
 }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/MakeServiceImpl.java

@@ -290,7 +290,7 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         updateMake.setMa_statuscode(Status.AUDITED.name());
         updateMake.setUpdateTime(new Date());
         updateMake.setUpdaterId(BaseContextHolder.getUserId());
-        updateMake.setMa_auditman("");
+        updateMake.setMa_auditman(BaseContextHolder.getUserName());
         updateMake.setMa_auditdate(new Date());
         getMapper().updateByPrimaryKeySelective(updateMake);
         DocBaseDTO docBaseDTO = generateMsgObj(make.getId(), make.getMa_code());
@@ -316,7 +316,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
                 makeListDTO.setItems(makeMaterials);
                 singleAudit(makeListDTO);
             } catch (Exception e){
-                errorMsg.append("编号：" + base.getCode() + "处理失败," + e.getMessage());
+                String msg = BizExceptionCode.DEAL_FAILED.getMessage();
+                errorMsg.append(String.format(msg, base.getCode(), e.getMessage()));
             }
         }
         return errorMsg.toString();
@@ -348,7 +349,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
-            prodInOut.setPi_text1(make.getMa_code());       //自定义字段1   赋值为制造单号
+            prodInOut.setPi_macode(make.getMa_code());       //制造单号
+            prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
             prodInOut.setCreateTime(new Date());
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
@@ -408,7 +410,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
-            prodInOut.setPi_text1(make.getMa_code());       //自定义字段1   赋值为制造单号
+            prodInOut.setPi_macode(make.getMa_code());       //制造单号
+            prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
             prodInOut.setCreateTime(new Date());
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
@@ -459,7 +462,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
-            prodInOut.setPi_text1(make.getMa_code());       //自定义字段1   赋值为制造单号
+            prodInOut.setPi_macode(make.getMa_code());       //制造单号
+            prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
             prodInOut.setCreateTime(new Date());
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
@@ -517,7 +521,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
-            prodInOut.setPi_text1(make.getMa_code());       //自定义字段1   赋值为制造单号
+            prodInOut.setPi_macode(make.getMa_code());       //制造单号
+            prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
             prodInOut.setCreateTime(new Date());
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
@@ -612,7 +617,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
                 Long id =  base.getId();
                 singleUnAudit(id);
             }catch (Exception e) {
-                errorMsg.append("编号：" + base.getCode() + "处理失败," + e.getMessage());
+                String msg = BizExceptionCode.DEAL_FAILED.getMessage();
+                errorMsg.append(String.format(msg, base.getCode(), e.getMessage()));
             }
         }
         return errorMsg.toString();
@@ -687,8 +693,9 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         if(!StringUtils.isEmpty(map.get("result"))){
             throw new BizException(76203, map.get("result").toString());
         }
-        prodInOutMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
         prodIODetailMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
+        prodInOutMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
+
 
         if ("拆件".equals(type)){
             map.put("class", "拆件领料单");
@@ -703,11 +710,11 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             throw new BizException(76204, map.get("result").toString());
         }
         if ("拆件".equals(type)){
-            prodInOutMapper.deleteByInOutNo(outCode, "拆件领料单", BaseContextHolder.getCompanyId());
             prodIODetailMapper.deleteByInOutNo(outCode, "拆件领料单", BaseContextHolder.getCompanyId());
+            prodInOutMapper.deleteByInOutNo(outCode, "拆件领料单", BaseContextHolder.getCompanyId());
         }else if ("组装".equals(type)){
-            prodInOutMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
             prodIODetailMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
+            prodInOutMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
         }
     }
 

applications/storage/storage-server/src/main/resources/mapper/MakeMapper.xml

@@ -414,7 +414,7 @@
     </select>
 
     <select id="selectMakeInOutCode" resultType="string">
-        SELECT PI_INOUTNO FROM PRODINOUT WHERE COMPANYID=#{companyId} AND PI_TEXT1=#{code} AND PI_CLASS=#{type}
+        SELECT PI_INOUTNO FROM PRODINOUT WHERE COMPANYID=#{companyId} AND PI_MACODE=#{code} AND PI_CLASS=#{type}
     </select>
 
   <update id="calcMakePriceAndTotal" parameterType="long" >

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

@@ -189,6 +189,12 @@
       <if test="pi_ioid != null">
         pi_ioid,
       </if>
+        <if test="pi_maid != null">
+            pi_maid,
+        </if>
+        <if test="pi_macode != null">
+            pi_macode,
+        </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -305,6 +311,12 @@
       <if test="pi_ioid != null">
         #{pi_ioid,jdbcType=INTEGER},
       </if>
+        <if test="pi_maid != null">
+            #{pi_maid,jdbcType=INTEGER},
+        </if>
+        <if test="pi_macode != null">
+            #{pi_macode,jdbcType=VARCHAR},
+        </if>
     </trim>
   </insert>
 

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -30,19 +30,27 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         columnWidth: 0.5,
         operation: 'between'
     },{
-        xtype: 'multicombo',
-        name: 'pd_statuscode',
+        xtype: 'combobox',
+        name: 'pb_statuscode',
         fieldLabel: '审核状态',
-        datas: [
-            ["ALL", "全部"],
-            ["AUDITED", "已审核"],
-            ["UNAUDITED", "未审核"]
-        ],
+        queryMode: 'local',
+        displayField: 'name',
+        valueField: 'value',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+            fields: ['value', 'name'],
+            data: [
+                ["ALL", "全部"],
+                ["AUDITED", "已审核"],
+                ["UNAUDITED", "未审核"]
+            ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
             }else {
-                return 'pu_statuscode=\'' + value + '\'';
+                return 'pb_statuscode=\'' + value + '\'';
             }
         }
     }],

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -38,14 +38,22 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         columnWidth: 0.5,
         operation: 'between'
     },{
-        xtype: 'multicombo',
+        xtype: 'combobox',
         name: 'rb_statuscode',
         fieldLabel: '审核状态',
-        datas: [
-            ["ALL", "全部"],
-            ["AUDITED", "已审核"],
-            ["UNAUDITED", "未审核"]
-        ],
+        queryMode: 'local',
+        displayField: 'name',
+        valueField: 'value',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+            fields: ['value', 'name'],
+            data: [
+                ["ALL", "全部"],
+                ["AUDITED", "已审核"],
+                ["UNAUDITED", "未审核"]
+            ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';