修改耗材单据bug

src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java

@@ -142,6 +142,7 @@ public class PurOrderReceiveController extends BaseController {
             purReceiveEntity.setTargetDeptCode(targetWarehouseEntity.getParentId());
             receiveService.insertOrder(purReceiveEntity);
         }
+        System.out.println(addReceiveDetailRequest.getDatas()+"999");
         for (AddReceiveDetailRequest.DetaiData detaiData : addReceiveDetailRequest.getDatas()) {
 
             PurReceiveDetailEntity purReceiveDetailEntity = new PurReceiveDetailEntity();

src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java

@@ -21,6 +21,8 @@ public class FilterReceiveRequest extends ListPageRequest {
     private String deptCode;
     private String invCode;
     private Integer status;
+    private String corpName;
+    private String billAction;
 
     private Integer type;
 

src/main/java/com/glxp/api/res/inout/ReceiveResponse.java

@@ -98,4 +98,6 @@ public class ReceiveResponse {
     private String targetDeptCode;
     private String targetDeptName;
 
+    private String billTypeName;
+
 }

src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java

@@ -36,7 +36,9 @@ public class ReceiveServiceImpl implements ReceiveService {
 
     @Override
     public int updateOrder(PurReceiveEntity purReceiveEntity) {
-        return receiveDao.updateById(purReceiveEntity);
+        QueryWrapper<PurReceiveEntity> ew=new QueryWrapper<>();
+        ew.eq("billNo",purReceiveEntity.getBillNo());
+        return receiveDao.update(purReceiveEntity,ew);
     }
 
     @Override

src/main/resources/mybatis/mapper/inout/ReceiveDao.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.glxp.api.dao.inout.ReceiveDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.ReceiveResponse">
         select io.*,
-               (select name from basic_bussiness_type bus where bus.action = io.billType) billTypeName,
+               ( SELECT originName FROM basic_bustype_change bus WHERE bus.originAction = io.billType ) billTypeName,
                (select name from auth_dept ad where ad.code = io.deptCode)                deptName,
                (select name from auth_warehouse aw where aw.code = io.invCode)            invName,
                (select employeeName from auth_user au where au.id = io.createUser)        createUserName,
@@ -16,6 +16,9 @@
             <if test="billType != null and billType != ''">
                 AND billType = #{billType}
             </if>
+            <if test="corpName != null and corpName != ''">
+                AND ( SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.targetInvCode ) = #{corpName}
+            </if>
             <if test="billNo != null and billNo != ''">
                 AND billNo like concat('%', #{billNo}, '%')
             </if>