优化出入库信息2

jiazx0107@163.com

2023-06-29 f46a102b5f5ab7e2c74c9d05f9d6e06c358b8c02

优化出入库信息2

 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java

@@ -663,6 +663,8 @@
    @RequestMapping("/submit-handle")
    @Transactional
    public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {
    	
        log.debug("-------------submitHandle------------------");
        return inoutManager.submitHandle(data);
    }


 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java

@@ -445,7 +445,6 @@
            this.updateCheckItems(data, true);
        }


        return null;
    }


 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java

@@ -267,7 +267,6 @@
        bill.setFullTime(DateFormatUtils.format(data.getFullWeightTime(),
                "yyyy-MM-dd HH:mm:ss"));
        bill.setSerId(data.getId());
//        bill.setSpecType(StringUtils.isEmpty(data.getSpecType()) ? "散粮" : data.getSpecType());
        if ("5016".equals(data.getCompanyId())) {
            bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));
            bill.setSerId(data.getId().substring(2));
@@ -275,7 +274,6 @@
        }

        //客户信息
        // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
        bill.setCustomerName(data.getCustomerName() == null ? "" : data.getCustomerName());
        bill.setUserId(data.getUserId() == null ? "" : data.getUserId());
        bill.setUserAddress(data.getUserAddress() == null ? "" : data.getUserAddress());
@@ -311,19 +309,10 @@
        bill.setRecordWeight(data.getRecordWeight());
        bill.setCheckStatus(data.getCheckStatus().equals(InoutConstant.STATUS_PASS) ? "合格" : "不合格");

//        bill.setDeWet(data.getDeWet());
//        bill.setDeImpurity(data.getDeImpurity());
        bill.setDeHandle(data.getDeHandle());
        bill.setDeOther(data.getDeOther());
//        bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());

        bill.setSettleWeight(data.getSettleWeight());
//        if(data.getWet() != null && data.getWet() > 0){
//            bill.setWet(data.getWet() +"");
//        }
//        if(data.getImpurity() != null && data.getImpurity() > 0){
//            bill.setImpurity(data.getImpurity()+"");
//        }

        bill.setPrice(data.getPrice() == null ? "" : data.getPrice() + "");
        if (data.getSettleMoney() <= 0) {

 igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java

@@ -152,9 +152,18 @@
                data.setUserName("");
            }

            inoutMapper.insertData(data);
            InoutData newData;
            if (EntityUtils.isEntity(data)) {
                newData = new InoutData();
                BeanUtils.copyProperties(data, newData, new String[]{"checkItems", "files"});
            }else{
                newData = data;
            }

            updateInoutCache(data);
            inoutMapper.insertData(newData);


            updateInoutCache(newData);

        } catch (Exception e) {
            log.error("------------出入库执行保存出错---{}", e);

 igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java

@@ -80,15 +80,10 @@
     */
    @DataResolver
    public String saveInoutData(InoutData data) throws Exception {

        //将DoradoEntity 转换为普通Entity
        InoutData newData =  new InoutData();
        BeanUtils.copyProperties(data,newData);
    	
        if (StringUtils.isEmpty(newData.getId())) {
            return inoutManager.addInoutData(newData);
        if (StringUtils.isEmpty(data.getId())) {
            return inoutManager.addInoutData(data);
        } else {
            return inoutManager.updateInoutData(newData);
            return inoutManager.updateInoutData(data);
        }
    }