修改单据bug

src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java

@@ -64,49 +64,49 @@ public class IoCodeLostController extends BaseController {
     }
 
 
-    @AuthRuleAnnotation("")
+//    @AuthRuleAnnotation("")
-    @PostMapping("warehouse/inout/saveTabCode")
+//    @PostMapping("warehouse/inout/saveTabCode")
-    public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) {
+//    public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) {
-
+//
-        if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo()) && codeTempEntity.getSerialNo().length() > 20) {
+//        if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo()) && codeTempEntity.getSerialNo().length() > 20) {
-            return ResultVOUtils.error(500, "无效条码！序列号超出最大范围，不予缓存");
+//            return ResultVOUtils.error(500, "无效条码！序列号超出最大范围，不予缓存");
-        }
+//        }
-
+//
-        if (StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) && codeTempEntity.getBatchNo().length() > 20) {
+//        if (StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) && codeTempEntity.getBatchNo().length() > 20) {
-            return ResultVOUtils.error(500, "无效条码！批次号超出最大范围，不予缓存");
+//            return ResultVOUtils.error(500, "无效条码！批次号超出最大范围，不予缓存");
-        }
+//        }
-
+//
-        if (StrUtil.isBlank(codeTempEntity.getSerialNo()) && StrUtil.isBlank(codeTempEntity.getBatchNo())) {
+//        if (StrUtil.isBlank(codeTempEntity.getSerialNo()) && StrUtil.isBlank(codeTempEntity.getBatchNo())) {
-            return ResultVOUtils.error(500, "批次号不能为空！，不予缓存");
+//            return ResultVOUtils.error(500, "批次号不能为空！，不予缓存");
-        }
+//        }
-        if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
+//        if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-            return ResultVOUtils.error(500, "有序列号不予缓存");
+//            return ResultVOUtils.error(500, "有序列号不予缓存");
-        }
+//        }
-
+//
-        IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeTempEntity.getCode());
+//        IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeTempEntity.getCode());
-        IoCodeLostEntity insertEntity = null;
+//        IoCodeLostEntity insertEntity = null;
-        if (codeLostEntity == null) {
+//        if (codeLostEntity == null) {
-            insertEntity = new IoCodeLostEntity();
+//            insertEntity = new IoCodeLostEntity();
-            insertEntity.setCreateTime(new Date());
+//            insertEntity.setCreateTime(new Date());
-        } else {
+//        } else {
-            insertEntity = codeLostEntity;
+//            insertEntity = codeLostEntity;
-        }
+//        }
-        insertEntity.setCode(codeTempEntity.getCode());
+//        insertEntity.setCode(codeTempEntity.getCode());
-        insertEntity.setBatchNo(codeTempEntity.getBatchNo());
+//        insertEntity.setBatchNo(codeTempEntity.getBatchNo());
-        insertEntity.setProduceDate(codeTempEntity.getProduceDate());
+//        insertEntity.setProduceDate(codeTempEntity.getProduceDate());
-        insertEntity.setExpireDate(codeTempEntity.getExpireDate());
+//        insertEntity.setExpireDate(codeTempEntity.getExpireDate());
-        insertEntity.setSerialNo(codeTempEntity.getSerialNo());
+//        insertEntity.setSerialNo(codeTempEntity.getSerialNo());
-        insertEntity.setSupId(codeTempEntity.getSupId());
+//        insertEntity.setSupId(codeTempEntity.getSupId());
-        insertEntity.setUpdateTime(new Date());
+//        insertEntity.setUpdateTime(new Date());
-        insertEntity.setCreateTime(new Date());
+//        insertEntity.setCreateTime(new Date());
-        if (codeLostEntity != null) {
+//        if (codeLostEntity != null) {
-            codeLostService.update(insertEntity);
+//            codeLostService.update(insertEntity);
-        } else {
+//        } else {
-            insertEntity.setId(IdUtil.getSnowflakeNextId());
+//            insertEntity.setId(IdUtil.getSnowflakeNextId());
-            codeLostService.insert(insertEntity);
+//            codeLostService.insert(insertEntity);
-        }
+//        }
-        return ResultVOUtils.success("修改成功！");
+//        return ResultVOUtils.success("修改成功！");
-    }
+//    }
 
 
     //获取验收单据业务详情

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -245,10 +245,11 @@ public class IoOrderController extends BaseController {
         BaseResponse tempResponse = checkSubmitEnable(orderEntity);
         if (tempResponse != null)
             return tempResponse;
-
+        //todo 目前先去掉因为不能改变状态 有问题可以看一下这个方法
-        if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE)
+//        if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE){
-
             ioAddInoutService.dealProcess(orderEntity);
+//        }
+
 
         //不需要手动校验，则走正常单据校验处理流程
         if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
@@ -358,6 +359,10 @@ public class IoOrderController extends BaseController {
 
 
     public BaseResponse checkSubmitEnable(IoOrderEntity orderEntity) {
+        if(orderEntity==null){
+            return ResultVOUtils.error(500, "提交失败，请先添加物资！");
+        }
+
         if (orderEntity.getStatus() == ORDER_STATUS_CHECK_PROCESS || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_PROCESS
                 || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_PROCESSING) {
             return ResultVOUtils.error(500, "提交失败，单据正在处理，请稍后刷新查看！");

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -11,6 +11,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.constant.FileConstant;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
@@ -23,6 +24,7 @@ import com.glxp.api.req.inout.*;
 import com.glxp.api.req.purchase.purPlanPrintRequest;
 import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
+import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.service.system.SystemPDFModuleService;
@@ -60,6 +62,8 @@ public class IoOrderDetailResultController extends BaseController {
     @Resource
     IoCodeService codeService;
     @Resource
+    CustomerService customerService;
+    @Resource
     private SystemPDFTemplateService systemPDFTemplateService;
     @Resource
     private SystemPDFModuleService systemPDFModuleService;
@@ -97,6 +101,8 @@ public class IoOrderDetailResultController extends BaseController {
             return ResultVOUtils.success("");
         }
         orderDetailResultRequest.setActions(actions);
+        AuthAdmin authAdmin= customerService.getUserBean();
+        orderDetailResultRequest.setInvCode(authAdmin.getLocInvCode());
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderList(orderDetailResultRequest);
 
         for (IoOrderDetailResultResponse orderDetailResultResponse : list) {

src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java

@@ -361,6 +361,12 @@ public class IoOrderMutiController {
         ioOrderMutiUseEntity.setUseUser(customerService.getUserId() + "");
         ioOrderMutiUseEntity.setUseTime(new Date());
         ioOrderMutiUseService.save(ioOrderMutiUseEntity);
+
+        //更新主表数量
+        ioOrderMutiEntity.setUseCount(ioOrderMutiEntity.getUseCount()+1);
+        ioOrderMutiEntity.setReCount(ioOrderMutiEntity.getReCount()-1);
+        ioOrderMutiEntity.setUpdateTime(new Date());
+        ioOrderMutiService.updateById(ioOrderMutiEntity);
         return ResultVOUtils.success();
     }
 

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

@@ -43,6 +43,7 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String startAduditTime;  //起始日期
     private String endAduditTime;       //结束日期
     private String fromCorp;
+    private String invCode;
     private String actionType;
     private String manufacturer;
     private String zczbhhzbapzbh;

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

@@ -23,6 +23,7 @@ import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
+import com.glxp.api.util.udi.UdiCalCountUtil;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -56,7 +57,7 @@ public class IoOrderMutiServiceImpl extends ServiceImpl<IoOrderMutiMapper, IoOrd
     @Resource
     GennerOrderUtils gennerOrderUtils;
     @Resource
-    private IoOrderMutiSetService ioOrderMutiSetService;
+    private UdiCalCountUtil udiCalCountUtil;
 
     @Override
     public List<IoOrderMutiResponse> filterList(IoOrderMutiRequest ioOrderMutiRequest) {
@@ -114,14 +115,16 @@ public class IoOrderMutiServiceImpl extends ServiceImpl<IoOrderMutiMapper, IoOrd
             ioOrderDetailCodeEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
             ioOrderDetailCodeEntity.setManufacturer(udiRelevanceResponse.getManufactory());
             ioOrderDetailCodeEntity.setMeasname(udiRelevanceResponse.getMeasname());
+            ioOrderDetailCodeEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
+            ioOrderDetailCodeEntity.setPrice(udiRelevanceResponse.getPrice());
             ioOrderDetailCodeEntity.setSpec(udiRelevanceResponse.getGgxh());
         }
         ioOrderDetailCodeEntity.setBatchNo(ioOrderMutiEntity.getBatchNo());
         ioOrderDetailCodeEntity.setProductDate(ioOrderMutiEntity.getProduceDate());
         ioOrderDetailCodeEntity.setExpireDate(ioOrderMutiEntity.getExpireDate());
         ioOrderDetailCodeEntity.setSupId(ioOrderMutiEntity.getSupId());
-        ioOrderDetailCodeEntity.setCount(ioOrderMutiEntity.getTotalCount());
+        ioOrderDetailCodeEntity.setCount(1);
-        ioOrderDetailCodeEntity.setReCount(ioOrderMutiEntity.getTotalCount());
+        ioOrderDetailCodeEntity.setReCount(udiCalCountUtil.getActCount(ioOrderDetailCodeEntity.getNameCode()));
         ioOrderDetailCodeEntity.setUpdateTime(new Date());
         ioOrderDetailCodeService.insert(ioOrderDetailCodeEntity);
 

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

@@ -40,6 +40,9 @@
             <if test="nameCode != null and nameCode != ''">
                 AND a2.nameCode = #{nameCode}
             </if>
+            <if test="invCode != null and invCode != ''">
+                AND a1.invCode = #{invCode}
+            </if>
             <if test="spec != null and spec != ''">
                 AND a2.spec like concat('%', #{spec}, '%')
             </if>