代码提交

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalancedetMapper.java

@@ -14,9 +14,9 @@ public interface PaybalancedetMapper {
 
     int insertSelective(Paybalancedet record);
 
-    Paybalancedet selectByPrimaryKey(Integer pdId);
+    List<Paybalancedet> selectByPrimaryKey(Integer pdId);
 
-    int updateByPrimaryKeySelective(List<Paybalancedet> record);
+    int updateByPrimaryKeySelective(Paybalancedet record);
 
     int updateByPrimaryKey(Paybalancedet record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalancedetailMapper.java

@@ -14,7 +14,7 @@ public interface PaybalancedetailMapper {
 
     int insertSelective(Paybalancedetail record);
 
-    Paybalancedetail selectByPrimaryKey(Integer pbdId);
+    List<Paybalancedetail> selectByPrimaryKey(Integer pbdId);
 
     int updateByPrimaryKeySelective(Paybalancedetail record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -70,7 +70,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             paybalancedet1.setPd_rbid(Math.toIntExact(rbId));
             paybalancedet1.setCompanyId(BaseContextHolder.getCompanyId());
             if (paybalancedet1.getId() > 0 ){
-                paybalancedetMapper.updateByPrimaryKey(paybalancedet1);
+                paybalancedetMapper.updateByPrimaryKeySelective(paybalancedet1);
             }else {
                 paybalancedetMapper.insertSelective(paybalancedet1);
             }
@@ -135,8 +135,8 @@ public class PaybalanceServiceImpl implements PaybalanceService {
     public Pay select(int id){
         Pay pay = new Pay();
         pay.setMain(paybalanceMapper.selectByPrimaryKey(id));
-        pay.setItems1((List<Paybalancedet>) paybalancedetMapper.selectByPrimaryKey(id));
-        pay.setItems2((List<Paybalancedetail>) paybalancedetailMapper.selectByPrimaryKey(id));
+        pay.setItems1(paybalancedetMapper.selectByPrimaryKey(id));
+        pay.setItems2(paybalancedetailMapper.selectByPrimaryKey(id));
         return pay;
     }
 

applications/money/money-server/src/main/resources/mapper/PaybalancedetMapper.xml

@@ -3,24 +3,24 @@
 <mapper namespace="com.usoftchina.saas.money.mapper.PaybalancedetMapper" >
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Paybalancedet" >
     <id column="pd_id" property="id" jdbcType="INTEGER" />
-    <result column="pd_rbid" property="pdRbid" jdbcType="INTEGER" />
-    <result column="pd_detno" property="pdDetno" jdbcType="INTEGER" />
-    <result column="pd_ym" property="pdYm" jdbcType="INTEGER" />
-    <result column="pd_bankid" property="pdBankid" jdbcType="INTEGER" />
-    <result column="pd_bankcode" property="pdBankcode" jdbcType="VARCHAR" />
-    <result column="pd_bankname" property="pdBankname" jdbcType="VARCHAR" />
-    <result column="pd_amount" property="pdAmount" jdbcType="DOUBLE" />
-    <result column="pd_paymethod" property="pdPaymethod" jdbcType="VARCHAR" />
-    <result column="pd_paycode" property="pdPaycode" jdbcType="VARCHAR" />
-    <result column="pd_remark" property="pdRemark" jdbcType="VARCHAR" />
+    <result column="pd_rbid" property="pd_rbid" jdbcType="INTEGER" />
+    <result column="pd_detno" property="pd_detno" jdbcType="INTEGER" />
+    <result column="pd_ym" property="pd_ym" jdbcType="INTEGER" />
+    <result column="pd_bankid" property="pd_bankid" jdbcType="INTEGER" />
+    <result column="pd_bankcode" property="pd_bankcode" jdbcType="VARCHAR" />
+    <result column="pd_bankname" property="pd_bankname" jdbcType="VARCHAR" />
+    <result column="pd_amount" property="pd_amount" jdbcType="DOUBLE" />
+    <result column="pd_paymethod" property="pd_paymethod" jdbcType="VARCHAR" />
+    <result column="pd_paycode" property="pd_paycode" jdbcType="VARCHAR" />
+    <result column="pd_remark" property="pd_remark" jdbcType="VARCHAR" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
-    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
-    <result column="pd_text1" property="pdText1" jdbcType="VARCHAR" />
-    <result column="pd_text2" property="pdText2" jdbcType="VARCHAR" />
-    <result column="pd_text3" property="pdText3" jdbcType="VARCHAR" />
-    <result column="pd_text4" property="pdText4" jdbcType="VARCHAR" />
-    <result column="pd_text5" property="pdText5" jdbcType="VARCHAR" />
+    <result column="pd_text1" property="pd_text1" jdbcType="VARCHAR" />
+    <result column="pd_text2" property="pd_text2" jdbcType="VARCHAR" />
+    <result column="pd_text3" property="pd_text3" jdbcType="VARCHAR" />
+    <result column="pd_text4" property="pd_text4" jdbcType="VARCHAR" />
+    <result column="pd_text5" property="pd_text5" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     pd_id, pd_rbid, pd_detno, pd_ym, pd_bankid, pd_bankcode, pd_bankname, pd_amount, 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -153,12 +153,24 @@ public class PurchaseController {
         return Result.success();
     }
 
+    @PostMapping("/batchClose")
+    public Result batchClose(@RequestBody BatchDealBaseDTO baseDTOs) {
+        purchaseService.batchClose(baseDTOs);
+        return Result.success();
+    }
+
     @PostMapping("/open/{id}")
     public Result openPurchase(@PathVariable(value = "id") long id){
          purchaseService.openPurchase(id);
         return Result.success();
     }
 
+    @PostMapping("/batchOpen")
+    public Result batchOpen(@RequestBody BatchDealBaseDTO baseDTOs) {
+        purchaseService.batchOpen(baseDTOs);
+        return Result.success();
+    }
+
     @PostMapping("/turnProdin/{id}")
     public Result turnProdin(@PathVariable("id") Long id){
         return purchaseService.turnProdin(id);

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

@@ -3,15 +3,11 @@ package com.usoftchina.saas.purchase.service;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseService;
-
-
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
-import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
-import com.usoftchina.saas.purchase.dto.PurchaseReqDTO;
 import com.usoftchina.saas.purchase.mapper.PurchaseMapper;
 import com.usoftchina.saas.purchase.po.Purchase;
 import com.usoftchina.saas.purchase.po.PurchaseList;
@@ -121,19 +117,22 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      */
     void closePurchase(long id);
 
+    void batchClose(BatchDealBaseDTO baseDTOs);
+
     /**
      * 采购单恢复
      * @param id
      */
     void openPurchase(long id);
 
+    void batchOpen(BatchDealBaseDTO baseDTOs);
 
     /**
      * 转采购验收单
      * @param id
      * @return
      */
-    public Result turnProdin(Long id);
+    Result turnProdin(Long id);
 
 
 }

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

@@ -270,7 +270,17 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     }
 
     @Override
-    public void closePurchase(long id) {
+    public void batchClose(BatchDealBaseDTO baseDTOs) {
+        if (null == baseDTOs || null == baseDTOs.getBaseDTOs() ||
+                baseDTOs.getBaseDTOs().size() == 0) {
+            return;
+        }
+        for (DocBaseDTO base : baseDTOs.getBaseDTOs()) {
+            singleClose(base.getId());
+        }
+    }
+
+    private DocBaseDTO singleClose(Long id) {
         Purchase purchase = purchaseMapper.selectByPrimaryKey(id);
         if(Status.CLOSE.name().equals(purchase.getPu_statuscode())){
             throw new BizException(BizExceptionCode.BIZ_CLOSE);
@@ -283,11 +293,29 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
         messageLogService.close(docBaseDTO);
+        return docBaseDTO;
     }
 
+
     @Override
-    public void openPurchase(long id) {
+    public void closePurchase(long id) {
+        singleClose(id);
+    }
+
+    @Override
+    public void batchOpen(BatchDealBaseDTO baseDTOs) {
+        if (null == baseDTOs || null == baseDTOs.getBaseDTOs() ||
+                baseDTOs.getBaseDTOs().size() == 0) {
+            return;
+        }
+        for (DocBaseDTO base : baseDTOs.getBaseDTOs()) {
+            singleOpen(base.getId());
+        }
+    }
+
+    private DocBaseDTO singleOpen(Long id) {
         Purchase purchase = purchaseMapper.selectByPrimaryKey(id);
+        DocBaseDTO docBaseDTO = null;
         if(!Status.CLOSE.name().equals(purchase.getPu_acceptstatuscode())){
             throw new BizException(BizExceptionCode.BIZ_OPEN);
         }
@@ -318,10 +346,17 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchase.setPu_acceptstatuscode(Status.TURNIN.name());
             }
             purchaseMapper.updateByPrimaryKeySelective(purchase);
-            DocBaseDTO docBaseDTO = getBaseDTOById(id);
+            docBaseDTO = getBaseDTOById(id);
             //日志
             messageLogService.open(docBaseDTO);
+            return docBaseDTO;
         }
+        return docBaseDTO;
+    }
+
+    @Override
+    public void openPurchase(long id) {
+        singleOpen(id);
     }
 
     @Override

frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -113,14 +113,14 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         }],
                         //窗口字段设置
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
-                            getCondition: function(v) {
-                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            },
                             allowBlank : true, 
-                            columnWidth : 0.25
+                            columnWidth : 0.25,
+                            getCondition:function(v){
+                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail） like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
+                            }
                         }],
                         //窗口列设置
                         dbColumns:[{

frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -112,15 +112,15 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_spec) like '%"+v.toUpperCase()+"%')";
                             }
-                        }],                        
+                        }],                       
                         //窗口列设置
                         dbColumns:[{
                             "text": "物料ID",

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -199,13 +199,13 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_spec) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                         
                         dbColumns:[{

frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -205,15 +205,15 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_spec) like '%"+v.toUpperCase()+"%')";
                             }
-                        }],                         
+                        }],                        
                         dbColumns:[{
                             "text": "物料ID",
                             "dataIndex": "id",

frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -193,13 +193,13 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_spec) like '%"+v.toUpperCase()+"%')";
                             }
                         }],                        
                         dbColumns:[{