diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java index 794e7a0..6a9a705 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java @@ -60,7 +60,7 @@ public class StIvtIostorinv implements Serializable { /** * 仓库标识 */ - private Long stor_id; + private String stor_id; /** * 仓库编码 @@ -180,12 +180,12 @@ public class StIvtIostorinv implements Serializable { /** * 部门ID */ - private Long sysdeptid; + private String sysdeptid; /** * 公司ID */ - private Long syscompanyid; + private String syscompanyid; /** * 是否删除 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml index df7e2dc..c58bd1a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml @@ -595,7 +595,7 @@ ) AS c LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id - LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id +-- LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id INNER JOIN pdm_bi_subpackagerelationrecord sub ON sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no AND sub.bill_id = dis.iostorinv_id @@ -628,10 +628,10 @@ - AND sect.sect_type_attr ]]> '09' +-- AND sect.sect_type_attr ]]> '09' - AND sect.sect_type_attr = '09' +-- AND sect.sect_type_attr = '09' AND LEFT(sub.container_name,2) IN diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 814427e..5d94c19 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -2047,7 +2047,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl inWriteOffPageDatas(ChargePageParam paramMap, PageQuery page); + /** + * 出库冲销 - 做出库 + * @param paramMap + */ void inWriteOffCharge(StIvtIostorinv paramMap); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/dto/InventoryChangeDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/dto/InventoryChangeDto.java new file mode 100644 index 0000000..5d3da9b --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/dto/InventoryChangeDto.java @@ -0,0 +1,74 @@ +package org.nl.wms.st.inbill.service.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 仓位库存变动信息dto + * + * @Author: lyd + * @Date: 2025/6/12 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class InventoryChangeDto implements Serializable { + /** + * 仓位标识 + */ + private String struct_id; + /** + * 物料标识 + */ + private String material_id; + /** + * 品质类型 + */ + private String quality_scode; + /** + * 批次 + */ + private String pcsn; + /** + * 库存等级 + */ + private String ivt_level; + /** + * 是否可用 + */ + private String is_active; + /** + * 变动数(必填，大于0) + */ + private BigDecimal change_qty; + /** + * 单据类型 + */ + private String bill_type_scode; + /** + * 单据标识 + */ + private String inv_id; + /** + * 单据编号 + */ + private String bill_code; + /** + * 单据表名(非必填) + */ + private String bill_table; + /** + * 单位标识 + */ + private String qty_unit_id; + /** + * 单位名称 + */ + private String qty_unit_name; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java index a020699..996f469 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java @@ -39,6 +39,7 @@ import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.st.inbill.service.InchargeService; import org.nl.wms.st.inbill.service.StorPublicService; import org.nl.wms.st.inbill.service.dto.ChargePageParam; +import org.nl.wms.st.inbill.service.dto.InventoryChangeDto; import org.nl.wms.st.inbill.service.vo.WriteOffVo; import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; import org.nl.wms.stat.service.enums.OutBillTypeEnum; @@ -355,7 +356,6 @@ public class InchargeServiceImpl implements InchargeService { jsonIvt.put("bill_table", "ST_IVT_IOStorInv"); jsonIvt.put("change_qty", json2.getDoubleValue("real_qty")); storPublicService.IOStor(jsonIvt, "11"); - // 锁定仓位 JSONObject jsonAttr = attrTab.query("struct_id = '" + jsonIvt.getString("struct_id") + "'").uniqueResult(0); jsonAttr.put("lock_type", "3"); @@ -407,11 +407,11 @@ public class InchargeServiceImpl implements InchargeService { outOrder.setDis_optid(currentUserId); outOrder.setDis_optname(nickName); outOrder.setDis_time(DateUtil.now()); - outOrder.setConfirm_optid(""); + outOrder.setConfirm_optid("0"); outOrder.setConfirm_optname(""); outOrder.setConfirm_time(""); - outOrder.setSysdeptid(deptId); - outOrder.setSyscompanyid(deptId); + outOrder.setSysdeptid(String.valueOf(deptId)); + outOrder.setSyscompanyid(String.valueOf(deptId)); iStIvtIostorinvService.save(outOrder); // 根据入库明细生成出库明细 List needSaveOutDisList = new ArrayList<>(); @@ -488,6 +488,23 @@ public class InchargeServiceImpl implements InchargeService { jsonIvt.put("change_qty", inDis.getReal_qty()); storPublicService.IOStor(jsonIvt, "11"); + InventoryChangeDto inventoryChangeDto = InventoryChangeDto.builder() + .struct_id(structivt.getStruct_id()) + .material_id(structivt.getMaterial_id()) + .quality_scode(structivt.getQuality_scode()) + .pcsn(structivt.getPcsn()) + .ivt_level("") + .is_active("") + .change_qty(inDis.getReal_qty()) + .bill_table("ST_IVT_IOStorInv") + .bill_type_scode(outOrder.getBill_type()) + .inv_id(outOrder.getIostorinv_id()) + .bill_code(outOrder.getBill_code()) + .qty_unit_id(structivt.getQty_unit_id()) + .qty_unit_name("").build(); + +// storPublicService.ioInventoryModify(inventoryChangeDto, "11"); + needLockStructIds.add(jsonIvt.getString("struct_id")); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java index e85e7c7..2e98939 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java @@ -344,7 +344,7 @@ public class OutChargeServiceImpl implements OutChargeService { outDtl.setSource_billdtl_id(oldDtl.getSource_billdtl_id()); outDtl.setSource_bill_type(oldOutOrder.getBill_type()); outDtl.setSource_bill_code(oldOutOrder.getBill_code()); - outDtl.setSource_bill_table("st_ivt_iostorinvdtl"); + outDtl.setSource_bill_table("ST_IVT_IOStorInv"); outDtl.setAssign_qty(disRow.getPlan_qty()); outDtl.setUnassign_qty(BigDecimal.ZERO); // 手工入库明细 后面批次插入 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index bbfa90f..111feee 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -242,7 +242,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { .io_type("0") .bill_type((String) whereJson.get("bill_type")) .biz_date(whereJson.get("biz_date").toString().substring(0, 10)) - .stor_id(Long.valueOf((String) whereJson.get("stor_id"))) + .stor_id((String) whereJson.get("stor_id")) .stor_code(stIvtBsrealstorattr.getStor_code()) .stor_name(stIvtBsrealstorattr.getStor_name()) .detail_count(BigDecimal.valueOf(rows.size())) @@ -257,8 +257,8 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { .update_time(String.valueOf(DateUtil.parse(now))) .is_delete("0") .is_upload("0") - .sysdeptid(SecurityUtils.getDeptId()) - .syscompanyid(SecurityUtils.getDeptId()) + .sysdeptid(String.valueOf(SecurityUtils.getDeptId())) + .syscompanyid(String.valueOf(SecurityUtils.getDeptId())) .build(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java index 4c37831..58f26a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java @@ -1,7 +1,6 @@ package org.nl.wms.stat.rest; -import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -12,8 +11,10 @@ import org.nl.wms.stat.service.dto.InBillPageParam; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -40,7 +41,7 @@ public class InBillQueryController { } @GetMapping(value = "/query2") - @Log("查询") + @Log("新查询") public ResponseEntity query2(InBillPageParam whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(inBillQueryService.getPage2(whereJson, page)), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java index 9c7fd86..baeb558 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java @@ -1,7 +1,6 @@ package org.nl.wms.stat.rest; -import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -12,8 +11,10 @@ import org.nl.wms.stat.service.dto.OutBillPageParam; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -26,7 +27,6 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor - @RequestMapping("/api/out/OutQuery") @Slf4j public class OutBillQueryController {