diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml index 48c80fe6..242486c9 100644 --- a/mes/hd/nladmin-system/pom.xml +++ b/mes/hd/nladmin-system/pom.xml @@ -58,11 +58,11 @@ - - com.yomahub - tlog-all-spring-boot-starter - 1.5.0 - + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java index b11dc81d..e7343094 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java @@ -143,34 +143,24 @@ public class StringUtils { * 获取ip地址 */ public static String getIp(HttpServletRequest request) { - // TODO 不解析IP地址 - if(true){ - return "127.0.0.1"; - } - - String ip = request.getHeader("x-forwarded-for"); - if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + String ip = request.getHeader("X-Forwarded-For"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); } - if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("WL-Proxy-Client-IP"); } - if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getRemoteAddr(); } - String comma = ","; - String localhost = "127.0.0.1"; - if (ip.contains(comma)) { - ip = ip.split(",")[0]; - } - if (localhost.equals(ip)) { - // 获取本机真正的ip地址 - try { - ip = InetAddress.getLocalHost().getHostAddress(); - } catch (UnknownHostException e) { - log.error(e.getMessage(), e); - } + + if (ip != null && ip.contains(",")) { + String[] ipArray = ip.split(","); + ip = ipArray[0]; } + return ip; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java index e855f82c..3937e760 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.json.XML; @@ -14,6 +15,15 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.common.utils.WebServiceUtil; import org.nl.wms.ext.sap.service.WmsToSapService; +import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService; +import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; +import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService; +import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; +import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; +import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; +import org.nl.wms.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService; +import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -25,6 +35,15 @@ import java.util.HashMap; @Slf4j public class WmsToSapServiceImpl implements WmsToSapService { + @Autowired + private IMdPbMeasureunitService mdPbMeasureunitService; + @Autowired + private IMdMeMaterialbaseService materialbaseService; + @Autowired + private IMdCsCustomerbaseService customerbaseService; + @Autowired + private IMpsSaleOrderService saleOrderService; + @Override public JSONObject getMater(JSONObject form) { return null; @@ -119,38 +138,39 @@ public class WmsToSapServiceImpl implements WmsToSapService { sale_jo.put("sale_type", row.getString("Auart")); String material_code = row.getString("Matnr").replaceAll("^(0+)", ""); //获取物料对应的物料标识 - JSONObject mater_jo = WQLObject.getWQLObject("MD_ME_MaterialBase").query("material_code = '" + material_code + "'").uniqueResult(0); + MdMeMaterialbase mater_jo = materialbaseService.getOne(new QueryWrapper().eq("material_code", material_code)); if (ObjectUtil.isEmpty(mater_jo)) { sale_jo.put("material_id", "0"); sale_jo.put("is_success", "0"); sale_jo.put("remark", "未查询到该销售订单对应的物料主数据：" + material_code); err_num++; } else { - String material_id = mater_jo.getString("material_id"); + String material_id =mater_jo.getMaterial_id(); sale_jo.put("material_id", material_id); } sale_jo.put("status", "10"); sale_jo.put("sale_qty", row.getString("Kwmeng")); sale_jo.put("produce_seq", "1"); String cust_code = row.getString("Kunnr"); - JSONObject cust_jo = WQLObject.getWQLObject("md_cs_customerbase").query("cust_code = '" + cust_code + "'").uniqueResult(0); + MdCsCustomerbase cust_jo = customerbaseService.getOne(new QueryWrapper().eq("cust_code", cust_code)); if (ObjectUtil.isNotEmpty(cust_jo)) { - sale_jo.put("cust_id", cust_jo.getString("cust_id")); - sale_jo.put("cust_code", cust_jo.getString("cust_code")); - sale_jo.put("cust_name", cust_jo.getString("cust_name")); + sale_jo.put("cust_id", cust_jo.getCust_id()); + sale_jo.put("cust_code", cust_jo.getCust_code()); + sale_jo.put("cust_name", cust_jo.getCust_name()); } else { sale_jo.put("is_success", "0"); sale_jo.put("remark", "未查询到该销售订单对应的客户信息：" + cust_code); err_num++; } String unit_code = row.getString("Vrkme"); - JSONObject unit_jo = WQLObject.getWQLObject("md_pb_measureunit").query("unit_name = '" + unit_code + "'").uniqueResult(0); + MdPbMeasureunit unit_jo = mdPbMeasureunitService.getOne(new QueryWrapper() + .eq("unit_name", unit_code)); if (ObjectUtil.isEmpty(unit_jo)) { sale_jo.put("qty_unit_id", "0"); sale_jo.put("remark", "未查询到该销售订单对应的单位信息：" + unit_code); err_num++; } else { - sale_jo.put("qty_unit_id", unit_jo.getString("measure_unit_id")); + sale_jo.put("qty_unit_id", unit_jo.getMeasure_unit_id()); } sale_jo.put("plandeliver_date", row.getString("Edatu")); sale_jo.put("create_id", SecurityUtils.getCurrentUserId()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java new file mode 100644 index 00000000..4392220a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java @@ -0,0 +1,21 @@ +package org.nl.wms.masterdata_manage.master.controller.customer; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 客户基本信息表 前端控制器 + *

+ * + * @author generator + * @since 2023-06-25 + */ +@RestController +@RequestMapping("/mdCsCustomerbase") +public class MdCsCustomerbaseController { + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java index 7ba6ffea..167fac99 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java @@ -127,7 +127,8 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl> list = this.listMaps(query); return getMaps(list); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java new file mode 100644 index 00000000..c0b3434c --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.master.service.customer; + +import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 客户基本信息表 服务类 + *

+ * + * @author generator + * @since 2023-06-25 + */ +public interface IMdCsCustomerbaseService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java new file mode 100644 index 00000000..38db9561 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java @@ -0,0 +1,144 @@ +package org.nl.wms.masterdata_manage.master.service.customer.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 客户基本信息表 + *

+ * + * @author generator + * @since 2023-06-25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_cs_customerbase") +public class MdCsCustomerbase implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户标识 + */ + private Long cust_id; + + /** + * 客户编码 + */ + private String cust_code; + + /** + * 客户名称 + */ + private String cust_name; + + /** + * 法人代表 + */ + private String jurid_name; + + /** + * 税务登记号 + */ + private String tax_no; + + /** + * 工商注册号 + */ + private String register_no; + + /** + * 经营许可证号 + */ + private String manage_lice_no; + + /** + * 营业执照 + */ + private String busi_char_name; + + /** + * 行政区划 + */ + private Long area_id; + + /** + * 邮政编码 + */ + private String zip_code; + + /** + * 公司电话 + */ + private String corp_tele_no; + + /** + * 公司地址 + */ + private String corp_address; + + /** + * 创建人 + */ + private Long create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private Long update_id; + + /** + * 修改人姓名 + */ + private String update_name; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 启用时间 + */ + private String is_used_time; + + /** + * 是否启用 + */ + private String is_used; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 外部标识 + */ + private String ext_id; + + /** + * 备注 + */ + private String remark; + + /** + * 分类标识 + */ + private Long class_id; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/MdCsCustomerbaseMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/MdCsCustomerbaseMapper.java new file mode 100644 index 00000000..70114ae6 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/MdCsCustomerbaseMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.master.service.customer.dao.mapper; + +import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 客户基本信息表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-06-25 + */ +public interface MdCsCustomerbaseMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/xml/MdCsCustomerbaseMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/xml/MdCsCustomerbaseMapper.xml new file mode 100644 index 00000000..cdef1f82 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/mapper/xml/MdCsCustomerbaseMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java new file mode 100644 index 00000000..71ee6956 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.masterdata_manage.master.service.customer.impl; + +import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; +import org.nl.wms.masterdata_manage.master.service.customer.dao.mapper.MdCsCustomerbaseMapper; +import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 客户基本信息表 服务实现类 + *

+ * + * @author generator + * @since 2023-06-25 + */ +@Service +public class MdCsCustomerbaseServiceImpl extends ServiceImpl implements IMdCsCustomerbaseService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java index a2225b97..e6b0e815 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java @@ -28,6 +28,7 @@ public class MdPbStoragevehicleext implements Serializable { /** * 载具编码 */ + @TableId private String storagevehicle_id; /** * 载具编码 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java index 099698c3..a63a67c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java @@ -39,6 +39,7 @@ public class StructattrController { @ApiOperation("查询仓位") //@PreAuthorize("@el.check('structattr:list')") public ResponseEntity queryAll(StructarrQuery query, PageQuery page) { + page.setSort("struct_code ASC"); Page list = ivtStructattrService.page(page.build(StIvtStructattr.class), query.build()); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java index e1683602..f08a8bc1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java @@ -169,16 +169,29 @@ public class PdmProduceWorkorderController { @ApiOperation("报工数修改") @SaIgnore public ResponseEntity reportQuery2(ReportQuery param, PageQuery pageQuery) { - Page page = PageHelper - .startPage(pageQuery.getPage() + 1, pageQuery.getSize()) - .setOrderBy("workorder_code desc,seq_number asc"); - param.setOrderby("true"); + Page page = null; + if (pageQuery.getPage() != null && pageQuery.getSize() !=null){ + page = PageHelper + .startPage(pageQuery.getPage() + 1, pageQuery.getSize()) + .setOrderBy("workorder_code desc,seq_number asc"); + param.setOrderby("true"); + } List list = iPdmProduceWorkorderService.reportQuery(param); TableDataInfo build = TableDataInfo.build(list); - build.setTotalElements(page.getTotal()); + if (page!=null){ + build.setTotalElements(page.getTotal()); + } return new ResponseEntity<>(build, HttpStatus.OK); } + @PostMapping("/reportQuery3") + @Log("工单报工数") + @ApiOperation("工单报工数") + @SaIgnore + public ResponseEntity reportQuery3(@RequestBody ReportQuery param) { + return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)), HttpStatus.OK); + } + @Log("导出数据") @ApiOperation("导出数据") @PostMapping(value = "/download") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index c13e3454..f49943d9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -633,6 +633,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl query(IvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtflowService.queryAll(query,page), HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java index 2029478f..0a241ce4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java @@ -45,12 +45,7 @@ public class StIvtStructivtflow implements Serializable { /** * 物料标识 */ - private String material_code; - - /** - * 物料规格 - */ - private String material_spec; + private String material_id; /** * 批次 @@ -79,7 +74,7 @@ public class StIvtStructivtflow implements Serializable { /** * 单据类型 */ - private String bill_type; + private String bill_type_scode; /** * 单据标识 @@ -104,17 +99,17 @@ public class StIvtStructivtflow implements Serializable { /** * 变动时间 */ - private Date create_time; + private String change_time; /** * 变动人 */ - private String create_id; + private String change_person_id; /** * 变动人姓名 */ - private String create_name; + private String change_person_name; /** * 变动数 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java index d099a168..f80ecdb5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/StIvtStructivtflowBcpMapper.java @@ -1,7 +1,12 @@ package org.nl.wms.storage_manage.basedata.service.record.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtStructivtflowBcpMapper extends BaseMapper { + List queryAll(@Param("query") IvtFlowQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml index 0b9f8883..8eefcdcb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/mapper/xml/StIvtStructivtflowBcpMapper.xml @@ -2,4 +2,44 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java index 7c56dbaf..be1d7478 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java @@ -1,8 +1,11 @@ package org.nl.wms.storage_manage.basedata.service.record.service; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; /** *

@@ -15,4 +18,8 @@ import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowD public interface IStIvtStructivtflowService extends IService { void recordStructivtFlow(StIvtStructivtflowDto flowDto); + + void insetIvtChange(JSONObject json); + + Object queryAll(IvtFlowQuery query, PageQuery page); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java index d7fc06c8..845129a3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java @@ -1,6 +1,12 @@ package org.nl.wms.storage_manage.basedata.service.record.service.impl; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; @@ -13,6 +19,8 @@ import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivt import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,6 +42,8 @@ public class StIvtStructivtflowServiceImpl extends ServiceImpl().eq("material_id", flowDto.getMaterial_id())); - flow.setMaterial_code(material.getMaterial_code()); - flow.setMaterial_spec(material.getMaterial_spec()); flow.setPcsn(flowDto.getPcsn()); } 仓库信息:{ @@ -58,9 +66,6 @@ public class StIvtStructivtflowServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query)); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java index 44d6d7ba..57fdcb8b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java @@ -1,5 +1,15 @@ package org.nl.wms.storage_manage.productmanage.controller.structIvt; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtflowCpService; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,8 +22,18 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-04 */ @RestController -@RequestMapping("/stIvtStructivtflowCp") +@RequestMapping("/api/stIvtStructivtflowCp") public class StIvtStructivtflowCpController { + @Autowired + private IStIvtStructivtflowCpService iStIvtStructivtflowCpService; + + @GetMapping + @Log("查询库存变动记录") + @ApiOperation("查询库存变动记录") + public ResponseEntity query(IvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtflowCpService.queryAll(query,page), HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/dao/StIvtCheckdtlCp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/dao/StIvtCheckdtlCp.java index 807590e8..435c56d2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/dao/StIvtCheckdtlCp.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/dao/StIvtCheckdtlCp.java @@ -107,7 +107,7 @@ public class StIvtCheckdtlCp implements Serializable { /** * 是否已下发 */ - private String is_down; + private Boolean is_down; /** * 盘点数量 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckdtlCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckdtlCpServiceImpl.java index ce12448a..81ee1250 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckdtlCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckdtlCpServiceImpl.java @@ -82,14 +82,7 @@ public class StIvtCheckdtlCpServiceImpl extends ServiceImpl().lambda() - .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, row.getStoragevehicle_code()) - ); - - row.setStoragevehicle_id(vehicleDao.getStoragevehicle_id()); - row.setStoragevehicle_code(vehicleDao.getStoragevehicle_code()); + row.setStoragevehicle_id(IdUtil.getStringId()); // 随机生成 row.setStatus(CHECKEnum.DTL_STATUS.code("生成")); this.save(row); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java index 58f24258..efcc1859 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java @@ -544,7 +544,7 @@ public class StIvtCheckmstCpServiceImpl extends ServiceImpl row.getIostorinvdtl_id().equals(dao.getIostorinvdtl_id())) .findAny().get(); - iStIvtStructivtCpService.UpdateIvt(ivtDataParam(dao,ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY,dtlDao.getBase_billdtl_id())); + + JSONObject param = ivtDataParam(dao, ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY, dtlDao.getBase_billdtl_id()); + param.put("bill_code",mstDao.getBill_code()); + param.put("inv_id",mstDao.getIostorinv_id()); + param.put("bill_type_scode",mstDao.getBill_type()); + iStIvtStructivtCpService.UpdateIvt(param); // 3）解锁起点 / 将此托盘上的库存全部出掉 unLockNext(dao.getStruct_id()); @@ -826,6 +831,9 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl list : collect.values()) { BigDecimal qty = list @@ -574,7 +578,11 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl().lambda() - .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, row.getStoragevehicle_code()) - .eq(MdPbStoragevehicleinfo::getIs_used, true) - ); + String storagevehicle_code = row.getStoragevehicle_code(); + if (ObjectUtil.isEmpty(storagevehicle_code)) { + storagevehicle_code = CodeUtil.getNewCode("VEHICCLE_CODE_CDMTP"); + } - if (ObjectUtil.isEmpty(vehicleDao)) throw new BadRequestException("载具不存在!"); - - row.setStoragevehicle_id(vehicleDao.getStoragevehicle_id()); - row.setStoragevehicle_code(vehicleDao.getStoragevehicle_code()); - row.setStoragevehicle_type(vehicleDao.getStoragevehicle_type()); + row.setStoragevehicle_code(storagevehicle_code); row.setStatus(MLEnum.DTL_STATUS.code("生成")); this.save(row); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java index c762935f..5599059f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java @@ -181,7 +181,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) @@ -189,7 +189,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code,dtl.getStoragevehicle_code()) - ); + );*/ // 更新货位 -- 清除载具号 structattrService.update( @@ -271,7 +271,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) @@ -280,7 +280,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) @@ -358,7 +358,7 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl @@ -13,4 +15,5 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStruct */ public interface IStIvtStructivtflowCpService extends IService { + Object queryAll(IvtFlowQuery query, PageQuery page); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java index b6eb6948..7cdba28b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.java @@ -1,7 +1,12 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +18,5 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStruct */ public interface StIvtStructivtflowCpMapper extends BaseMapper { + List queryAll(@Param("query") IvtFlowQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml index b113c5f6..28c7d3c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtflowCpMapper.xml @@ -2,4 +2,44 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java new file mode 100644 index 00000000..ca8aa330 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/IvtFlowQuery.java @@ -0,0 +1,33 @@ +package org.nl.wms.storage_manage.productmanage.service.structIvt.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; + +/* + * @author LXY + * @Date 2023/5/4 19:49 + */ +@Data +public class IvtFlowQuery extends BaseQuery { + + + private String struct_code; + + private String bill_code; + + private String change_type_scode; + + private String material_code; + + private String stor_id; + + @Override + public void paramMapping() { + super.doP.put("struct_code", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java index a66ff3b9..9bf3cda2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,6 +12,7 @@ import com.github.pagehelper.PageHelper; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; @@ -19,7 +21,9 @@ import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService; +import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtflowCpService; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtflowCp; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtCpMapper; import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.CpIvtQuery; import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil; @@ -54,6 +58,9 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); @@ -177,10 +184,30 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl implements IStIvtStructivtflowCpService { + @Override + public Object queryAll(IvtFlowQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query)); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java index c647d3f2..606eb7ac 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java @@ -50,7 +50,7 @@ public class StIvtIostorinvYlOutController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @PostMapping("/delete") + @DeleteMapping @Log("删除入库单") @ApiOperation("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java index a52d0663..b5c568dd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java @@ -1,8 +1,16 @@ package org.nl.wms.storage_manage.rawmanage.controller.structIvt; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; /** @@ -14,8 +22,18 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/stIvtStructivtflowYl") +@RequestMapping("/api/stIvtStructivtflowYl") public class StIvtStructivtflowYlController { + @Autowired + private IStIvtStructivtflowYlService iStIvtStructivtflowYlService; + + @GetMapping + @Log("查询库存变动记录") + @ApiOperation("查询库存变动记录") + public ResponseEntity query(IvtFlowQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtflowYlService.queryAll(query,page), HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml index 830120d0..44f34c69 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml @@ -3,7 +3,7 @@ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml index 53fb1399..98290f81 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml @@ -3,7 +3,7 @@ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java index db05c2db..3a445077 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java @@ -26,6 +26,7 @@ import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstora import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService; +import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvOutYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService; @@ -36,6 +37,7 @@ import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIos import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -74,6 +76,9 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl dtl_list = iostorinvdtlYlService.list(new QueryWrapper().eq("iostorinv_id", iostorinv_id)); @@ -187,12 +200,32 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl().eq("stockrecord_id", ivt.getStockrecord_id())); + // 插入库存变动记录 + JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivt)); + param.put("change_type", ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY); + param.put("change_qty",need_qty); + param.put("result_qty", 0); + param.put("bill_code",mst.getBill_code()); + param.put("inv_id",mst.getIostorinv_id()); + param.put("bill_type_scode",mst.getBill_type()); + iStIvtStructivtflowYlService.insetIvtChange(param); + need_qty = NumberUtil.sub(need_qty - canuse_qty).doubleValue(); } JSONObject mst_jo = new JSONObject(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java index d140b6dd..37785ddb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -22,6 +23,7 @@ import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstora import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService; import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService; +import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService; @@ -31,6 +33,7 @@ import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvd import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -65,6 +68,9 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl { + void insetIvtChange(JSONObject json); + + Object queryAll(IvtFlowQuery query, PageQuery page); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtflowYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtflowYl.java index e9d62a5c..84080779 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtflowYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/StIvtStructivtflowYl.java @@ -100,7 +100,7 @@ public class StIvtStructivtflowYl implements Serializable { /** * 变动时间 */ - private Date change_time; + private String change_time; /** * 变动人 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtflowYlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtflowYlMapper.java index e17b0da6..af27f955 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtflowYlMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtflowYlMapper.java @@ -1,8 +1,13 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper; +import org.apache.ibatis.annotations.Param; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtflowYl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; + /** *

* 仓位库存变动记录表 Mapper 接口 @@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtStructivtflowYlMapper extends BaseMapper { + List queryAll(@Param("query") IvtFlowQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml index 6a06028d..0ba99204 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtflowYlMapper.xml @@ -2,4 +2,43 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java index 299d9ed0..38758536 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtflowYlServiceImpl.java @@ -1,9 +1,22 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.impl; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtflowYl; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtflowYlMapper; import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtflowYlService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -17,4 +30,44 @@ import org.springframework.stereotype.Service; @Service public class StIvtStructivtflowYlServiceImpl extends ServiceImpl implements IStIvtStructivtflowYlService { + @Autowired + protected IStIvtStructattrService iStIvtStructattrService; // 仓位属性服务 + + @Override + public void insetIvtChange(JSONObject json) { + + StIvtStructattr ivtDao = iStIvtStructattrService.getById(json.getString("struct_id")); + + StIvtStructivtflowYl dao = new StIvtStructivtflowYl(); + dao.setChange_id(IdUtil.getStringId()); + dao.setStruct_id(json.getString("struct_id")); + dao.setStruct_code(json.getString("struct_code")); + dao.setStruct_name(json.getString("struct_name")); + dao.setMaterial_id(json.getString("material_id")); + dao.setQuality_scode(json.getString("quality_scode")); + dao.setIvt_level(json.getString("ivt_level")); + dao.setIs_active(json.getBoolean("is_active")); + dao.setPcsn(json.getString("pcsn")); + dao.setStor_id(ivtDao.getStor_id()); + dao.setChange_type_scode(json.getString("change_type")); + dao.setChange_time(DateUtil.now()); + dao.setChange_person_id(SecurityUtils.getCurrentUserId()); + dao.setChange_person_name(SecurityUtils.getCurrentNickName()); + dao.setChange_qty(json.getBigDecimal("change_qty")); + dao.setResult_qty(json.getBigDecimal("result_qty")); + dao.setQty_unit_id(json.getString("qty_unit_id")); + dao.setProduct_area(json.getString("workshop_id")); + dao.setBill_code(json.getString("bill_code")); + dao.setBill_type_scode(json.getString("bill_type_scode")); + dao.setInv_id(json.getString("inv_id")); + this.save(dao); + } + + @Override + public Object queryAll(IvtFlowQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.queryAll(query)); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java index 5786eb2b..4f2e5995 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java @@ -3,6 +3,7 @@ package org.nl.wms.storage_manage.semimanage.controller.iostorInv; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -10,6 +11,8 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService; import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; @@ -18,6 +21,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.Arrays; import java.util.Map; @@ -39,6 +43,9 @@ public class StIvtIostorinvBcpController { @Autowired private IStIvtIostorinvBcpService stIvtIostorinvBcpService; + @Autowired + private IMdPbStoragevehicleextService iMdPbStoragevehicleextService; // 载具扩展属性信息表服务 + @GetMapping @Log("查询入库单据") @ApiOperation("查询入库单据") @@ -62,6 +69,17 @@ public class StIvtIostorinvBcpController { stIvtIostorinvBcpService.update(new UpdateWrapper() .set("is_delete","1") .in("iostorinv_id",ids)); + + StIvtIostorinvBcp mst = stIvtIostorinvBcpService.getById(ids); + + // 更新载具扩展属性 - 释放载具对应物料关系 清空数量 + iMdPbStoragevehicleextService.update( + new MdPbStoragevehicleext() + .setMaterial_id("") + .setStorage_qty(BigDecimal.valueOf(0)), + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code,mst.getStoragevehicle_code()) + ); } return new ResponseEntity<>(HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java index 2da69ec4..c8bdb999 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java @@ -385,6 +385,7 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl().eq("struct_id", mst.getStruct_id())); + // 插入库存变动记录 + JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivtDao)); + param.put("change_type", ChangeIvtUtil.SUBFROZEN_SUBIVT_QTY); + param.put("change_qty", ivtDao.getCanuse_qty()); + param.put("result_qty", 0); + param.put("bill_code",mst.getBill_code()); + param.put("inv_id",mst.getIostorinv_id()); + param.put("bill_type_scode",mst.getBill_type()); + iStIvtStructivtflowService.insetIvtChange(param); + /*structivtflowService.recordStructivtFlow( StIvtStructivtflowDto.builder() .bill_code(mst.getBill_code()).change_type_scode(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM).bill_table("st_ivt_iostorinv_bcp") @@ -208,6 +226,15 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code,mst.getStoragevehicle_code()) + ); + return null; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java index 77c5f58f..91e4da1f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java @@ -25,6 +25,10 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; @@ -38,6 +42,7 @@ import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivt import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; +import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil; import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService; import org.nl.wms.storage_manage.productmanage.util.RuleUtil; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; @@ -83,7 +88,12 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, row.getString("storagevehicle_code")) + ); + + if (ObjectUtil.isEmpty(vehicleDao)) throw new BadRequestException("载具不存在！"); + + mst.setStoragevehicle_code(vehicleDao.getStoragevehicle_code()); + mst.setStoragevehicle_id(vehicleDao.getStoragevehicle_id()); + + // 更新载具对应物料关系、数量 + MdPbStoragevehicleext vehicleExtDao = iMdPbStoragevehicleextService.getOne( + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code, row.getString("storagevehicle_code")) + ); + if (ObjectUtil.isNotEmpty(vehicleDao)) { + vehicleExtDao.setStorage_qty(mst.getPlan_qty()); + vehicleExtDao.setMaterial_id(mst.getMaterial_id()); + iMdPbStoragevehicleextService.updateById(vehicleExtDao); + } + } } @Override @@ -158,7 +189,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl().lambda() diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml index a9e2af27..e092003d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml @@ -122,6 +122,7 @@ attr.struct_name, attr.sect_code, attr.sect_name, + attr.stor_name, attr.storagevehicle_code FROM st_ivt_structivt_bcp ivt diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index 9a5ee92a..0a0e78c6 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -19,7 +19,7 @@ https://juejin.cn/post/6844903775631572999 - http://192.168.46.225:9200/_bulk + http://127.0.0.1:9200/_bulk ${esIndex} mes_log es-logger @@ -79,10 +79,8 @@ https://juejin.cn/post/6844903775631572999 - true - + ${log.pattern} - @@ -100,15 +98,14 @@ https://juejin.cn/post/6844903775631572999 20GB - - + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - + 0 500 @@ -120,7 +117,6 @@ https://juejin.cn/post/6844903775631572999 - @@ -129,6 +125,10 @@ https://juejin.cn/post/6844903775631572999 + + + + @@ -168,6 +168,10 @@ https://juejin.cn/post/6844903775631572999 + + + + @@ -177,26 +181,36 @@ https://juejin.cn/post/6844903775631572999 + + + - + + - + + - + + - + + - + + \ - + + - + + \ @@ -211,11 +225,5 @@ https://juejin.cn/post/6844903775631572999 - - - - - - diff --git a/mes/qd/src/main.js b/mes/qd/src/main.js index ce679a61..9dc4b879 100644 --- a/mes/qd/src/main.js +++ b/mes/qd/src/main.js @@ -5,8 +5,6 @@ import Cookies from 'js-cookie' import 'normalize.css/normalize.css' import Element from 'element-ui' -// 列自适应宽度:https://github.com/legendJaden/AFTableColumn -import AFTableColumn from 'af-table-column' import 'font-awesome/css/font-awesome.css' @@ -44,8 +42,6 @@ import 'jquery' import VueBus from 'vue-bus' Vue.use(scroll) -Vue.use(AFTableColumn) - Vue.use(VueHighlightJS) Vue.use(mavonEditor) Vue.use(permission) diff --git a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue index 42f962f2..00d4faac 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue @@ -144,20 +144,20 @@ :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - + - + - - + + @@ -257,7 +256,7 @@ export default { open() { this.getworkprocedure() this.getMaterialClass() - crudProduceshiftorder.reportQuery({ workorder_id: this.form.workorder_id }).then(res => { + crudProduceshiftorder.reportQuery3({ workorder_id: this.form.workorder_id }).then(res => { this.tableData = res.content }) }, @@ -276,7 +275,7 @@ export default { 'material_id': this.form.material_id } crudClassstandard.queryClassById(param).then(res => { - this.form.class_name = res.content[0].class_name + this.$set(this.form,'class_name',res.content[0].class_name) }) }, getworkprocedure() { diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue index 304161f1..ece44153 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/index.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue @@ -16,6 +16,7 @@ clearable filterable size="mini" + style="width: 200px;" placeholder="区域类型" class="filter-item" @change="crud.toQuery()" @@ -28,12 +29,12 @@ - + @@ -42,7 +43,7 @@ - - - - + + + + - + @@ -138,7 +139,7 @@ @change="crud.toQuery" /> - + @@ -226,7 +227,7 @@ :title="crud.status.title" width="1200px" > - + - + - + - + - + - + - - - + + + @@ -400,44 +401,51 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -522,7 +530,19 @@ const defaultForm = { } export default { name: 'Produceshiftorder', - components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog, reportDialog, UploadDialog, ReplaceDeviceDialog }, + components: { + AddDialog, + pagination, + crudOperation, + rrOperation, + udOperation, + MaterDtl, + Treeselect, + ViewDialog, + reportDialog, + UploadDialog, + ReplaceDeviceDialog + }, mixins: [presenter(), header(), form(defaultForm), crud()], dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'product_area'], cruds() { @@ -614,7 +634,10 @@ export default { this.crud.toQuery() }, getNotWorkDeviceByWorkproceduceId(workprocedure_id) { // 根据工序标识获取设备列表 - crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ workprocedure_id: workprocedure_id,product_area:this.form.product_area }).then(res => { + crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ + workprocedure_id: workprocedure_id, + product_area: this.form.product_area + }).then(res => { this.deviceList = res.content }) }, diff --git a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js index 44d2ba5a..a617dae5 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js +++ b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js @@ -104,6 +104,7 @@ export function getReportWork(data) { } export function reportQuery(data) { + console.log(data) return request({ url: '/api/produceWorkorder/reportQuery2', method: 'get', @@ -111,6 +112,15 @@ export function reportQuery(data) { }) } + +export function reportQuery3(data) { + return request({ + url: '/api/produceWorkorder/reportQuery3', + method: 'post', + data + }) +} + export function excelImport(data) { return request({ url: 'api/produceWorkorder/excelImport', @@ -142,4 +152,4 @@ export function reportApprove(data) { }) } -export default { add, addRows, edit, del, submits, reportApprove, unSubmits, getTable, openStart, saveReport, finish, getReportWork, forceFinish, reportQuery, excelImport, getNotWorkDeviceByWorkproceduceId, replaceDevice } +export default { add, addRows, edit, del, submits, reportApprove, unSubmits, getTable, openStart, saveReport, finish, getReportWork, forceFinish, reportQuery, reportQuery3, excelImport, getNotWorkDeviceByWorkproceduceId, replaceDevice } diff --git a/mes/qd/src/views/wms/scheduler_manage/task/index.vue b/mes/qd/src/views/wms/scheduler_manage/task/index.vue index 805fc840..94a2e788 100644 --- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue +++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue @@ -156,13 +156,13 @@ - + - - - + + + diff --git a/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue index 14242cbe..7be83973 100644 --- a/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue +++ b/mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue @@ -44,7 +44,18 @@ - + + + 设置空位 + + { + structIds.push(item.workorder_id) + }) + alert(structIds) + // crudProduceshiftorder.submits(orders).then(res => { + // this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + // this.crud.toQuery() + // }) + }, // 取消下发 setMaterValue(row) { this.materialForm.material_id = row.material_id this.materialForm.material_code = row.material_code diff --git a/mes/qd/src/views/wms/storage_manage/product/productCheck/StructIvt.vue b/mes/qd/src/views/wms/storage_manage/product/productCheck/StructIvt.vue index 643532a6..489ed42c 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productCheck/StructIvt.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productCheck/StructIvt.vue @@ -27,7 +27,7 @@ v-model="query.bill_code" clearable size="mini" - placeholder="单据号" + placeholder="库区/货位" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" diff --git a/mes/qd/src/views/wms/storage_manage/product/productCheck/index.vue b/mes/qd/src/views/wms/storage_manage/product/productCheck/index.vue index 9766e95f..d7209e20 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productCheck/index.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productCheck/index.vue @@ -131,7 +131,7 @@ > 异常处理 - 导出Excel - + --> +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+
+ + + + diff --git a/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js new file mode 100644 index 00000000..994463b0 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/product/productIvtFlow/productivtFlow.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/stIvtStructivtflowCp', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/stIvtStructivtflowCp/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/stIvtStructivtflowCp/update', + method: 'post', + data + }) +} + +export default { + add, + edit, + del +} diff --git a/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue index d75d7b28..2e0b29db 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue @@ -149,12 +149,7 @@ :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - - - +