Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 5a8a8e3a7cbcc4872642ec36c3a4af30f3cf9d77

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	db/双林新火炬MES数据库设计.pdma.json

 db/Ë«ÁÖлð¾æMESÊý¾Ý¿âÉè¼Æ.pdma.json

@@ -2,7 +2,7 @@
  "name": "双林新火炬MES数据库设计",
  "describe": "描述双薪新火炬MES数据库设计详情",
  "avatar": "",
  "version": "4.9.4",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-8-15 14:58:22",
  "dbConns": [],
@@ -632,7 +632,7 @@
      "#DDE5FF"
    ],
    "DDLToggleCase": "L",
    "menuWidth": "309px"
    "menuWidth": "364px"
  },
  "entities": [
    {
@@ -61180,7 +61180,7 @@
          "codeRoot": ""
        }
      },
      "defKey": "lsw_​material",
      "defKey": "lsw_material",
      "defName": "线边库物料信息",
      "comment": "",
      "properties": {
@@ -61487,24 +61487,6 @@
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "material_model",
          "defName": "物料型号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "C2AF21CA-2BB0-4F88-9E66-F216401711A0"
        },
        {
          "defKey": "material_category",
          "defName": "物料类型",
          "comment": "成品/外法兰/内法兰/毛坯/配件",
@@ -61539,6 +61521,24 @@
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "11AE1590-5695-4C1E-A85F-72AAD8288740"
        },
        {
          "defKey": "material_status",
          "defName": "状态",
          "comment": "启用、禁用",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "D9381762-109B-4003-9520-FF30D6D1D2AF"
        }
      ],
      "correlations": [],

 src/main/java/org/jeecg/modules/base/entity/Factory.java

@@ -94,4 +94,9 @@
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    /**产线类型*/
    @Excel(name = "产线类型", width = 15)
    @ApiModelProperty(value = "产线类型")
    private String productionType;
}

 src/main/java/org/jeecg/modules/base/enums/ProductionTypeEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package org.jeecg.modules.base.enums;


public enum ProductionTypeEnum {
    /**
     * è£…配
     */
    ASSEMBLE,
    /**
     * å†…法兰
     */
    INNERFLANGE,
    /**
     * å¤–法兰
     */
    OUTERFLANGE,
    /**
     * çƒ­å¤„理
     */
    HEATTREATMENT
}

 src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java

@@ -74,6 +74,8 @@

    private String mdcFlag;

    private String productionType;

    private List<FactoryTreeModel> children = new ArrayList<>();

    public FactoryTreeModel() {
@@ -103,5 +105,6 @@
        this.updateTime = factory.getUpdateTime();
        this.mdcFlag = factory.getMdcFlag();
        this.factoryCategory = factory.getFactoryCategory();
        this.productionType = factory.getProductionType();
    }
}

 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java

@@ -10,6 +10,8 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
@@ -20,21 +22,15 @@
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.lsw.vo.LswMaterialPage;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -48,7 +44,7 @@
 */
@Api(tags = "线边库物料信息")
@RestController
@RequestMapping("/lswmaterial/lswMaterial")
@RequestMapping("/lsw/lswMaterial")
@Slf4j
public class LswMaterialController {
    @Autowired
@@ -67,7 +63,6 @@
     * @param req
     * @return
     */
    //@AutoLog(value = "线边库物料信息-分页列表查询")
    @ApiOperation(value = "线边库物料信息-分页列表查询", notes = "线边库物料信息-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<LswMaterial>> queryPageList(LswMaterial lswMaterial,
@@ -75,77 +70,55 @@
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
        QueryWrapper<LswMaterial> queryWrapper = QueryGenerator.initQueryWrapper(lswMaterial, req.getParameterMap());
        Page<LswMaterial> page = new Page<LswMaterial>(pageNo, pageSize);
        if (lswMaterial.isMaterialCategoryNull()) {
            queryWrapper.isNull("material_category");
        }
        Page<LswMaterial> page = new Page<>(pageNo, pageSize);
        IPage<LswMaterial> pageList = lswMaterialService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param lswMaterialPage
     * @return
     */
    @AutoLog(value = "线边库物料信息-添加")
    @ApiOperation(value = "线边库物料信息-添加", notes = "线边库物料信息-添加")
    //@RequiresPermissions("org.jeecg.modules:lsw_material:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody LswMaterialPage lswMaterialPage) {
        LswMaterial lswMaterial = new LswMaterial();
        BeanUtils.copyProperties(lswMaterialPage, lswMaterial);
        lswMaterialService.saveMain(lswMaterial, lswMaterialPage.getLswMaterialInventoryList());
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param lswMaterialPage
     * @param lswMaterial
     * @return
     */
    @AutoLog(value = "线边库物料信息-编辑")
    @ApiOperation(value = "线边库物料信息-编辑", notes = "线边库物料信息-编辑")
    //@RequiresPermissions("org.jeecg.modules:lsw_material:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody LswMaterialPage lswMaterialPage) {
        LswMaterial lswMaterial = new LswMaterial();
        BeanUtils.copyProperties(lswMaterialPage, lswMaterial);
        LswMaterial lswMaterialEntity = lswMaterialService.getById(lswMaterial.getId());
        if (lswMaterialEntity == null) {
            return Result.error("未找到对应数据");
    public Result<String> edit(@RequestBody LswMaterial lswMaterial) {
        boolean b = lswMaterialService.editMaterial(lswMaterial);
        if (!b) {
            return Result.error("编辑失败");
        }
        lswMaterialService.updateMain(lswMaterial, lswMaterialPage.getLswMaterialInventoryList());
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "线边库物料信息-通过id删除")
    @ApiOperation(value = "线边库物料信息-通过id删除", notes = "线边库物料信息-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:lsw_material:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        lswMaterialService.delMain(id);
        return Result.OK("删除成功!");
    @AutoLog(value = "线边库物料信息-启用")
    @ApiOperation(value = "线边库物料信息-启用", notes = "线边库物料信息-启用")
    @GetMapping("/active")
    public Result<?> active(@RequestParam("id") String id) {
        LswMaterial entity = lswMaterialService.getById(id);
        if (entity == null) {
            return Result.error("数据不存在");
        }
        entity.setMaterialStatus(CommonConstant.STATUS_1);
        lswMaterialService.updateById(entity);
        return Result.OK("操作成功");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "线边库物料信息-批量删除")
    @ApiOperation(value = "线边库物料信息-批量删除", notes = "线边库物料信息-批量删除")
    //@RequiresPermissions("org.jeecg.modules:lsw_material:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.lswMaterialService.delBatchMain(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    @AutoLog(value = "线边库物料信息-禁用")
    @ApiOperation(value = "线边库物料信息-禁用", notes = "线边库物料信息-禁用")
    @GetMapping("/inactive")
    public Result<?> inactive(@RequestParam("id") String id) {
        LswMaterial entity = lswMaterialService.getById(id);
        if (entity == null) {
            return Result.error("数据不存在");
        }
        entity.setMaterialStatus(CommonConstant.STATUS_0);
        lswMaterialService.updateById(entity);
        return Result.OK("操作成功");
    }

    /**
@@ -178,7 +151,7 @@
    public Result<List<LswMaterialInventory>> queryLswMaterialInventoryListByMainId(@RequestParam(name = "id", required = true) String id) {
        List<LswMaterialInventory> lswMaterialInventoryList = lswMaterialInventoryService.selectByMainId(id);
        for (LswMaterialInventory lswMaterialInventory : lswMaterialInventoryList) {
            if(StringUtils.isNotEmpty(lswMaterialInventory.getWarehouseId())){
            if (StringUtils.isNotEmpty(lswMaterialInventory.getWarehouseId())) {
                String warehouseId = lswMaterialInventory.getWarehouseId();
                LineSideWarehouse warehouse = lineSideWarehouseService.getById(warehouseId);
                lswMaterialInventory.setWarehouseName(warehouse.getWarehouseName());
@@ -226,47 +199,6 @@
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("线边库物料信息数据", "导出人:" + sysUser.getRealname(), "线边库物料信息"));
        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
        return mv;
    }

    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("org.jeecg.modules:lsw_material:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            // èŽ·å–上传文件对象
            MultipartFile file = entity.getValue();
            ImportParams params = new ImportParams();
            params.setTitleRows(2);
            params.setHeadRows(1);
            params.setNeedSave(true);
            try {
                List<LswMaterialPage> list = ExcelImportUtil.importExcel(file.getInputStream(), LswMaterialPage.class, params);
                for (LswMaterialPage page : list) {
                    LswMaterial po = new LswMaterial();
                    BeanUtils.copyProperties(page, po);
                    lswMaterialService.saveMain(po, page.getLswMaterialInventoryList());
                }
                return Result.OK("文件导入成功！数据行数:" + list.size());
            } catch (Exception e) {
                log.error(e.getMessage(), e);
                return Result.error("文件导入失败:" + e.getMessage());
            } finally {
                try {
                    file.getInputStream().close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        return Result.OK("文件导入失败！");
    }

    @GetMapping(value = "/searchlikeQuery")

 src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java

@@ -1,9 +1,6 @@
package org.jeecg.modules.lsw.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -18,62 +15,57 @@
/**
 * @Description: çº¿è¾¹åº“物料信息
 * @Author: jeecg-boot
 * @Date:   2025-06-30
 * @Date: 2025-06-30
 * @Version: V1.0
 */
@ApiModel(value="lsw_material对象", description="线边库物料信息")
@ApiModel(value = "lsw_material对象", description = "线边库物料信息")
@Data
@TableName("lsw_material")
public class LswMaterial implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建日期")
    private Date createTime;
    /**更新人*/
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新日期")
    private Date updateTime;
    /**所属部门*/
    @ApiModelProperty(value = "所属部门")
    private String sysOrgCode;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    /**删除标记*/
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**物料编码*/
    @Excel(name = "物料编码", width = 15)
    /**物料编码*/
    @ApiModelProperty(value = "物料编码")
    private String materialNumber;
    /**物料名称*/
    @Excel(name = "物料名称", width = 15)
    /**物料名称*/
    @ApiModelProperty(value = "物料名称")
    private String materialName;
    /**物料型号*/
    @Excel(name = "物料型号", width = 15)
    @ApiModelProperty(value = "物料型号")
    private String materialModel;
    /**物料类型*/
    @Excel(name = "物料类型", width = 15, dicCode = "material_category")
    /**物料类型*/
    @Dict(dicCode = "material_category")
    @ApiModelProperty(value = "物料类型")
    private String materialCategory;
    /**单位*/
    @Excel(name = "单位", width = 15)
    @ApiModelProperty(value = "单位")
    /**基本计量单位*/
    @ApiModelProperty(value = "基本计量单位")
    private String materialUnit;
    /**物料状态*/
    @ApiModelProperty(value = "物料状态")
    private String materialStatus;

    /** ç‰©æ–™ç±»åž‹æ˜¯å¦ä¸ºç©º */
    @TableField(exist = false)
    private boolean materialCategoryNull;
}

 src/main/java/org/jeecg/modules/lsw/enums/MaterialCategoryEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package org.jeecg.modules.lsw.enums;

public enum MaterialCategoryEnum {
    FINISHED_PRODUCT, //成品
    OUTER_FLANGE, //外法兰
    INNER_FLANGE, //内法兰
    COMPONENTS, //配件
    BLANK, //毛坯
    ;
}

 src/main/java/org/jeecg/modules/lsw/service/ILswMaterialService.java

@@ -3,11 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.sap.dto.OrderBomDTO;

import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;

@@ -19,36 +18,28 @@
 */
public interface ILswMaterialService extends IService<LswMaterial> {

    /**
     * æ·»åŠ ä¸€å¯¹å¤š
     *
     * @param lswMaterial
     * @param lswMaterialInventoryList
     */
    public void saveMain(LswMaterial lswMaterial,List<LswMaterialInventory> lswMaterialInventoryList) ;
	
    /**
     * ä¿®æ”¹ä¸€å¯¹å¤š
     *
   * @param lswMaterial
   * @param lswMaterialInventoryList
     */
    public void updateMain(LswMaterial lswMaterial,List<LswMaterialInventory> lswMaterialInventoryList);
	
    /**
     * åˆ é™¤ä¸€å¯¹å¤š
     *
     * @param id
     */
    public void delMain (String id);
	
    /**
     * æ‰¹é‡åˆ é™¤ä¸€å¯¹å¤š
     *
     * @param idList
     */
    public void delBatchMain (Collection<? extends Serializable> idList);

    IPage<Map<String, Object>> getLswMaterialListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
	

    /**
     * ç¼–辑物料信息
     * @param lswMaterial
     * @return
     */
    boolean editMaterial(LswMaterial lswMaterial);

    /**
     * æ ¹æ®ç‰©æ–™ç¼–号查询
     * @param materialNumber
     * @return
     */
    LswMaterial queryByMaterialNumber(String materialNumber);

    /**
     * æ‰¹é‡ä¿å­˜ç‰©æ–™åŸºæœ¬ä¿¡æ¯
     * @param orderMap
     * @param orderBomDTOList
     * @return
     */
    boolean saveOrUpdateMaterial(Map<String, MesProductionOrder> orderMap, List<OrderBomDTO> orderBomDTOList);
}

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java

@@ -1,106 +1,126 @@
package org.jeecg.modules.lsw.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper;
import org.jeecg.modules.lsw.mapper.LswMaterialMapper;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.sap.dto.OrderBomDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: çº¿è¾¹åº“物料信息
 * @Author: jeecg-boot
 * @Date:   2025-06-30
 * @Date: 2025-06-30
 * @Version: V1.0
 */
@Service
public class LswMaterialServiceImpl extends ServiceImpl<LswMaterialMapper, LswMaterial> implements ILswMaterialService {

    @Autowired
    private LswMaterialMapper lswMaterialMapper;
    @Autowired
    private LswMaterialInventoryMapper lswMaterialInventoryMapper;
	
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void saveMain(LswMaterial lswMaterial, List<LswMaterialInventory> lswMaterialInventoryList) {
        lswMaterialMapper.insert(lswMaterial);
        if(lswMaterialInventoryList!=null && lswMaterialInventoryList.size()>0) {
            for(LswMaterialInventory entity:lswMaterialInventoryList) {
                //外键设置
                entity.setMaterialId(lswMaterial.getId());
                lswMaterialInventoryMapper.insert(entity);
            }
        }
    }
    @Autowired
    private LswMaterialMapper lswMaterialMapper;
    @Autowired
    private LswMaterialInventoryMapper lswMaterialInventoryMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateMain(LswMaterial lswMaterial,List<LswMaterialInventory> lswMaterialInventoryList) {
        lswMaterialMapper.updateById(lswMaterial);
		
        //1.先删除子表数据
        lswMaterialInventoryMapper.deleteByMainId(lswMaterial.getId());
		
        //2.子表数据重新插入
        if(lswMaterialInventoryList!=null && lswMaterialInventoryList.size()>0) {
            for(LswMaterialInventory entity:lswMaterialInventoryList) {
                //外键设置
                entity.setMaterialId(lswMaterial.getId());
                lswMaterialInventoryMapper.insert(entity);
            }
        }
    }
    @Override
    public IPage<Map<String, Object>> getLswMaterialListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        Map<String, String> paramMap = new HashMap<String, String>();
        Map<String, String[]> parameterMap = req.getParameterMap();
        if (null != parameterMap) {
            if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
                paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
            }
            if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
                paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
            }
            if (parameterMap.containsKey("materialModel") && StringUtils.isNotBlank(parameterMap.get("materialModel")[0])) {
                paramMap.put("materialModel", parameterMap.get("materialModel")[0].trim());
            }
            if (parameterMap.containsKey("materialCategory") && StringUtils.isNotBlank(parameterMap.get("materialCategory")[0])) {
                paramMap.put("materialCategory", parameterMap.get("materialCategory")[0].trim());
            }
        }
        return super.getBaseMapper().getLswMaterialListData(pageData, paramMap);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delMain(String id) {
        lswMaterialInventoryMapper.deleteByMainId(id);
        lswMaterialMapper.deleteById(id);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean editMaterial(LswMaterial lswMaterial) {
        LswMaterial entity = this.getBaseMapper().selectById(lswMaterial.getId());
        if (entity == null) {
            throw new JeecgBootException("要编辑的数据不存在！");
        }
        entity.setMaterialCategory(lswMaterial.getMaterialCategory());
        this.updateById(entity);
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delBatchMain(Collection<? extends Serializable> idList) {
        for(Serializable id:idList) {
            lswMaterialInventoryMapper.deleteByMainId(id.toString());
            lswMaterialMapper.deleteById(id);
        }
    }
    @Override
    public LswMaterial queryByMaterialNumber(String materialNumber) {
        LambdaQueryWrapper<LswMaterial> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(LswMaterial::getMaterialNumber, materialNumber);
        queryWrapper.eq(LswMaterial::getDelFlag, CommonConstant.DEL_FLAG_0);
        List<LswMaterial> list = this.getBaseMapper().selectList(queryWrapper);
        if (CollectionUtil.isEmpty(list)) {
            return null;
        }
        return list.get(0);
    }

    @Override
    public IPage<Map<String, Object>> getLswMaterialListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        Map<String, String> paramMap = new HashMap<String, String>();
        Map<String, String[]> parameterMap = req.getParameterMap();
        if (null != parameterMap) {
            if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
                paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
            }
            if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
                paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
            }
            if (parameterMap.containsKey("materialModel") && StringUtils.isNotBlank(parameterMap.get("materialModel")[0])) {
                paramMap.put("materialModel", parameterMap.get("materialModel")[0].trim());
            }
            if (parameterMap.containsKey("materialCategory") && StringUtils.isNotBlank(parameterMap.get("materialCategory")[0])) {
                paramMap.put("materialCategory", parameterMap.get("materialCategory")[0].trim());
            }
        }
        return super.getBaseMapper().getLswMaterialListData(pageData, paramMap);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean saveOrUpdateMaterial(Map<String, MesProductionOrder> orderMap, List<OrderBomDTO> orderBomDTOList) {
        Map<String, LswMaterial> addMap = new HashMap<>();
        for (Map.Entry<String, MesProductionOrder> entry : orderMap.entrySet()) {
            MesProductionOrder order = entry.getValue();
            LswMaterial material = queryByMaterialNumber(order.getMaterialNumber());
            if (material == null) {
                //新增物料
                material = new LswMaterial();
                material.setMaterialStatus(CommonConstant.STATUS_1);
                material.setMaterialNumber(order.getMaterialNumber());
                material.setMaterialName(order.getMaterialName());
                material.setMaterialUnit(order.getProductionUnit());
                material.setDelFlag(CommonConstant.DEL_FLAG_0);
                addMap.put(material.getMaterialNumber(), material);
            }
        }
        for (OrderBomDTO bomDTO : orderBomDTOList) {
            LswMaterial material = queryByMaterialNumber(bomDTO.getMATNR());
            if (material == null) {
                //新增物料
                material = new LswMaterial();
                material.setMaterialStatus(CommonConstant.STATUS_1);
                material.setMaterialNumber(bomDTO.getMATNR());
                material.setMaterialName(bomDTO.getMAKTX());
                material.setMaterialUnit(bomDTO.getMEINS());
                material.setDelFlag(CommonConstant.DEL_FLAG_0);
                addMap.put(material.getMaterialNumber(), material);
            }
        }
        if (CollectionUtil.isNotEmpty(addMap)) {
            Collection<LswMaterial> addList = addMap.values();
            super.saveBatch(addList);
        }
        return true;
    }

}

 src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.mes.job;

import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.ThrowableUtil;
import org.jeecg.modules.mes.entity.MesProductionOrder;
@@ -87,6 +88,8 @@
    private ISysQuartzLogService sysQuartzLogService;
    @Autowired
    private IQuartzJobService quartzJobService;
    @Autowired
    private ILswMaterialService lswMaterialService;

    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -144,12 +147,19 @@
                log.error("返回类型错误， class:{}", result == null ? null : result.getClass());
                return;
            }
            //订单BOM数据处理
            List<OrderBomDTO> orderBomDTOList = (List<OrderBomDTO>) result;
            b = processBillMaterialsService.saveOrUpdateOrderBom(orderMap, orderBomDTOList);
            if (!b) {
                log.error("保存订单BOM失败，日期：{}", LocalDateTime.now());
                return;
            }
            //物料数据处理
            b = lswMaterialService.saveOrUpdateMaterial(orderMap, orderBomDTOList);
            if (!b) {
                log.error("保存物料失败，日期：{}", LocalDateTime.now());
                return;
            }
            //订单工序同步
            Map<String, Object> orderProcessMap = orderProcessSync.syncOrderProcess(FACTORY_CODE, orderCodes);
            if (orderBomMap == null || !SUCCESS_CODE.equals(orderProcessMap.get("ztype"))) {

 src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncUpdateJob.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.mes.job;

import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.ThrowableUtil;
import org.jeecg.modules.mes.entity.MesProductionOrder;
@@ -87,6 +88,8 @@
    private ISysQuartzLogService sysQuartzLogService;
    @Autowired
    private IQuartzJobService quartzJobService;
    @Autowired
    private ILswMaterialService lswMaterialService;

    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -150,6 +153,12 @@
                log.error("保存订单BOM失败，日期：{}", LocalDateTime.now());
                return;
            }
            //物料数据处理
            b = lswMaterialService.saveOrUpdateMaterial(orderMap, orderBomDTOList);
            if (!b) {
                log.error("保存物料失败，日期：{}", LocalDateTime.now());
                return;
            }
            //订单工序同步
            Map<String, Object> orderProcessMap = orderProcessSync.syncOrderProcess(FACTORY_CODE, orderCodes);
            if (orderBomMap == null || !SUCCESS_CODE.equals(orderProcessMap.get("ztype"))) {

 src/main/java/org/jeecg/modules/wms/controller/WMSTestController.java

@@ -8,6 +8,7 @@
import org.jeecg.modules.wms.dto.ReceiveMESScanItemListResponse;
import org.jeecg.modules.wms.request.ReceiveMESScanItemList;
import org.jeecg.modules.wms.service.ReceiveWMSScanItemListService;
import org.jeecg.modules.wms.service.WMSWebService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,8 +21,6 @@
public class WMSTestController {
    @Value("${webservice.url}")
    private String url;
    @Value("${webservice.namespace}")
    private String namespace;

    @ApiOperation(value = "WMS集成测试-接收WMS移库结果", notes = "WMS集成测试-接收WMS移库结果")
    @PostMapping("/testReceiveWMSScanItemList")
@@ -34,4 +33,15 @@
        ReceiveMESScanItemListResponse response = service.receiveWMSScanItemList(request);
        return Result.ok(response);
    }

    @ApiOperation(value = "WMS集成测试-HelloWord测试", notes = "WMS集成测试-HelloWord测试")
    @PostMapping("/testHelloWorld")
    public Result<?> testHelloWorld() {
        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
        factory.setAddress(url);
        factory.setServiceClass(WMSWebService.class);
        WMSWebService service = (WMSWebService) factory.create();
        String response = service.helloWorld();
        return Result.ok(response);
    }
}

 src/main/java/org/jeecg/modules/wms/service/WMSWebService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package org.jeecg.modules.wms.service;

import javax.jws.WebMethod;
import javax.jws.WebResult;
import javax.jws.WebService;

@WebService(name = "WebService", targetNamespace = "http://tempuri.org")
public interface WMSWebService {

    @WebMethod(operationName = "HelloWorld")
    @WebResult(name = "HelloWorldResponse")
    String helloWorld();
}

 src/main/java/org/jeecg/modules/wms/service/impl/ReceiveWMSScanItemListServiceImpl.java

@@ -6,13 +6,11 @@
import org.jeecg.modules.wms.dto.ReceiveMESScanItemListResponse;
import org.jeecg.modules.wms.request.ReceiveMESScanItemList;
import org.jeecg.modules.wms.service.ReceiveWMSScanItemListService;
import org.springframework.stereotype.Service;

import javax.jws.WebService;


@Slf4j
//@Service
@WebService(name = "ReceiveWMSScanItemListService",  targetNamespace = "http://xhj008.server.webservice.com", endpointInterface = "org.jeecg.modules.wms.service.ReceiveWMSScanItemListService")
public class ReceiveWMSScanItemListServiceImpl implements ReceiveWMSScanItemListService {