工具分类导入调整

cuijian

2025-06-25 bb47bf3d97d1a68e06a73ce275e81b5e581219d4

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InboundOrderServiceImpl.java

@@ -24,6 +24,7 @@
import org.jeecg.modules.tms.entity.vo.InboundDetailVo;
import org.jeecg.modules.tms.mapper.InboundOrderMapper;
import org.jeecg.modules.tms.service.*;
import org.jeecg.modules.tms.utils.QrCodePrinterUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -216,9 +217,12 @@
    }

    @Override
    public void addInStorage(JSONObject jSONObject) {
    public List<Map<String,String>> addInStorage(JSONObject jSONObject) {
        String inStorehouseType = jSONObject.getString("inStorehouseType");
        String locationCodeId = jSONObject.getString("locationCodeId");
        //二维码打印列表
        List<Map<String,String>> results = new ArrayList<>();
        List<String> contentList = new ArrayList<>();
        String classifyId = jSONObject.getString("classifyId");
        Date inboundTime = jSONObject.getDate("inboundTime");
        //获取入库明细
@@ -276,6 +280,7 @@
                        //增加库存明细
                        ToolLedgerDetail toolLedgerDetail = new ToolLedgerDetail();
                        toolLedgerDetail.setToolCode(inboundDetailVo.getToolCodeId());
                        toolLedgerDetail.setPositionCode(locationCodeId);
                        toolLedgerDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
                        toolLedgerDetail.setQuantity(BigDecimal.ONE);
                        toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
@@ -284,7 +289,20 @@
                        //更新当前编码
                        newBaseTools.setCurrentCode(result);
                        baseToolsService.updateById(newBaseTools);
                        //打印二维码
                        contentList.add(inboundDetailVo.getToolCode()+"-"+result);
                    }
                    //打印二维码，暂时注释，待现场调试打标机
//                    for(String content : contentList){
//                        Map<String,String> result = new HashMap<>();
//                        result.put("content",content);
//                        result.put("image", QrCodePrinterUtils.generateBacthQRCode(content, 200, 200));
//                        // 生成二维码图片（Base64）
//                        results.add(result);
//                    }
                    Map<String,String> result = new HashMap<>();
                    result.put("content","保存成功");
                    results.add(result);
                    //不管到把
                }else {
                    //保存入库流水
@@ -302,12 +320,17 @@
                        ToolLedgerDetail newToolLedgerDetail = new ToolLedgerDetail();
                        newToolLedgerDetail.setToolCode(inboundDetailVo.getToolCodeId());
                        newToolLedgerDetail.setQuantity(inboundDetailVo.getInStorageQuantity());
                        newToolLedgerDetail.setPositionCode(locationCodeId);
                        newToolLedgerDetail.setStatus("1");
                        toolLedgerDetailService.save(newToolLedgerDetail);
                    }else {
                        toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().add(inboundDetailVo.getInStorageQuantity()));
                        toolLedgerDetail.setPositionCode(locationCodeId);
                        toolLedgerDetailService.updateById(toolLedgerDetail);
                    }
                    Map<String,String> result = new HashMap<>();
                    result.put("content","保存成功");
                    results.add(result);
                }
            }
            //归还入库
@@ -330,6 +353,7 @@
                            .eq(ToolLedgerDetail::getToolId,inboundDetailVo.getOnlyCode()).one();
                    toolLedgerDetail.setQuantity(BigDecimal.ONE);
                    toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
                    toolLedgerDetail.setPositionCode(locationCodeId);
                    toolLedgerDetail.setStatus("1");
                    toolLedgerDetailService.updateById(toolLedgerDetail);
                    //保存入库流水
@@ -347,6 +371,7 @@
                    //增加库存明细可用库存，修改状态
                    ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId()).one();
                    toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().add(inboundDetailVo.getInStorageQuantity()));
                    toolLedgerDetail.setPositionCode(locationCodeId);
                    toolLedgerDetail.setStatus("1");
                    toolLedgerDetailService.updateById(toolLedgerDetail);
                    //保存入库流水
@@ -361,6 +386,9 @@
                }

            }
            Map<String,String> result = new HashMap<>();
            result.put("content","保存成功");
            results.add(result);
        }else if("5".equals(inStorehouseType)){
            //循环新增明细
            for(InboundDetailVo inboundDetailVo : inStoreDetailList) {
@@ -380,6 +408,7 @@
                            .eq(ToolLedgerDetail::getToolId,inboundDetailVo.getOnlyCode()).one();
                    toolLedgerDetail.setQuantity(BigDecimal.ONE);
                    toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
                    toolLedgerDetail.setPositionCode(locationCodeId);
                    toolLedgerDetail.setStatus("1");
                    toolLedgerDetailService.updateById(toolLedgerDetail);
                    //保存入库流水
@@ -397,6 +426,7 @@
                    //增加库存明细可用库存，修改状态
                    ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId()).one();
                    toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().add(inboundDetailVo.getInStorageQuantity()));
                    toolLedgerDetail.setPositionCode(locationCodeId);
                    toolLedgerDetail.setStatus("1");
                    toolLedgerDetailService.updateById(toolLedgerDetail);
                    //保存入库流水
@@ -411,13 +441,20 @@
                }

            }
            Map<String,String> result = new HashMap<>();
            result.put("content","保存成功");
            results.add(result);
        }
            return results;
    }

    @Override
    public void addApplyInStorage(JSONObject jSONObject) {
    public List<Map<String,String>> addApplyInStorage(JSONObject jSONObject) {
        String inStorehouseType = jSONObject.getString("inStorehouseType");
        String locationCodeId = jSONObject.getString("locationCodeId");
        //二维码打印列表
        List<Map<String,String>> results = new ArrayList<>();
        List<String> contentList = new ArrayList<>();
        //入库申请单id
        String orderId = jSONObject.getString("orderId");
        //获取入库明细
@@ -478,12 +515,26 @@
                        toolLedgerDetail.setToolId(inboundDetailVo.getToolCode()+"-"+result);
                        toolLedgerDetail.setQuantity(BigDecimal.ONE);
                        toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
                        toolLedgerDetail.setPositionCode(locationCodeId);
                        toolLedgerDetail.setStatus("1");
                        toolLedgerDetailService.save(toolLedgerDetail);
                        //更新当前编码
                        newBaseTools.setCurrentCode(result);
                        baseToolsService.updateById(newBaseTools);
                        //打印二维码
                        contentList.add(inboundDetailVo.getToolCode()+"-"+result);
                    }
                    //打印二维码，暂时注释，待现场验证打标机
//                    for(String content : contentList){
//                        Map<String,String> result = new HashMap<>();
//                        result.put("content",content);
//                        result.put("image", QrCodePrinterUtils.generateBacthQRCode(content, 200, 200));
//                        // 生成二维码图片（Base64）
//                        results.add(result);
//                    }
                    Map<String,String> result = new HashMap<>();
                    result.put("content","保存成功");
                    results.add(result);
                    //不管到把
                }else {
                    //保存入库流水
@@ -502,12 +553,17 @@
                        ToolLedgerDetail newToolLedgerDetail = new ToolLedgerDetail();
                        newToolLedgerDetail.setToolCode(inboundDetailVo.getToolCodeId());
                        newToolLedgerDetail.setQuantity(inboundDetailVo.getInStorageQuantity());
                        newToolLedgerDetail.setPositionCode(locationCodeId);
                        newToolLedgerDetail.setStatus("1");
                        toolLedgerDetailService.save(newToolLedgerDetail);
                    }else {
                        toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().add(inboundDetailVo.getInStorageQuantity()));
                        toolLedgerDetail.setPositionCode(locationCodeId);
                        toolLedgerDetailService.updateById(toolLedgerDetail);
                    }
                    Map<String,String> result = new HashMap<>();
                    result.put("content","保存成功");
                    results.add(result);
                }
                //更改明细入库状态及实际入库数量
                InboundDetail inboundDetail = inboundDetailService.getById(inboundDetailVo.getId());
@@ -535,6 +591,7 @@
                            .eq(ToolLedgerDetail::getToolId,inboundDetailVo.getOnlyCode()).one();
                    toolLedgerDetail.setQuantity(BigDecimal.ONE);
                    toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
                    toolLedgerDetail.setPositionCode(locationCodeId);
                    toolLedgerDetail.setStatus("1");
                    toolLedgerDetailService.updateById(toolLedgerDetail);
                    //保存入库流水
@@ -554,6 +611,7 @@
                    ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId()).one();
                    toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().add(inboundDetailVo.getInStorageQuantity()));
                    toolLedgerDetail.setStatus("1");
                    toolLedgerDetail.setPositionCode(locationCodeId);
                    toolLedgerDetailService.updateById(toolLedgerDetail);
                    //保存入库流水
                    InStoreDetail inStoreDetail = new InStoreDetail();
@@ -572,6 +630,9 @@
                inboundDetail.setInActualCount(inboundDetailVo.getInStorageQuantity());
                inboundDetailService.updateById(inboundDetail);
            }
            Map<String,String> result = new HashMap<>();
            result.put("content","保存成功");
            results.add(result);
        }else if("5".equals(inStorehouseType)){
            //循环新增明细
            for(InboundDetailVo inboundDetailVo : inStoreDetailList) {
@@ -591,6 +652,7 @@
                            .eq(ToolLedgerDetail::getToolId,inboundDetailVo.getOnlyCode()).one();
                    toolLedgerDetail.setQuantity(BigDecimal.ONE);
                    toolLedgerDetail.setRemainingPercentage(BigDecimal.ONE);
                    toolLedgerDetail.setPositionCode(locationCodeId);
                    toolLedgerDetail.setStatus("1");
                    toolLedgerDetailService.updateById(toolLedgerDetail);
                    //保存入库流水
@@ -610,6 +672,7 @@
                    ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolCode,inboundDetailVo.getToolCodeId()).one();
                    toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().add(inboundDetailVo.getInStorageQuantity()));
                    toolLedgerDetail.setStatus("1");
                    toolLedgerDetail.setPositionCode(locationCodeId);
                    toolLedgerDetailService.updateById(toolLedgerDetail);
                    //保存入库流水
                    InStoreDetail inStoreDetail = new InStoreDetail();
@@ -628,6 +691,9 @@
                inboundDetail.setInActualCount(inboundDetailVo.getInStorageQuantity());
                inboundDetailService.updateById(inboundDetail);
            }
            Map<String,String> result = new HashMap<>();
            result.put("content","保存成功");
            results.add(result);
        }
        //更改申请单入库状态
        InboundOrder inboundOrder = this.getById(orderId);
@@ -639,6 +705,7 @@
            inboundOrder.setInStatus("2");
        }
        this.updateById(inboundOrder);
        return results;
    }

    private LoginUser getCurrentUser() {