root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:代码合并

Browse Source
This commit is contained in:
liuxy
2023-05-29 10:49:49 +08:00
parent 973425d6a8
commit 5ef00cf5ce
16 changed files with 129 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
View File

@@ -102,5 +102,12 @@ public class IStivtlostorivnCpOutController {
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/getStructIvt")
@Log("获取手工分配库存")
@ApiOperation("获取手工分配库存")
public ResponseEntity<Object> getStructIvt(@RequestBody JSONObject whereJson){
return new ResponseEntity<>(iStIvtIostorinvCpOutService.getStructIvt(whereJson),HttpStatus.OK);
}
}

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
View File

@@ -122,4 +122,13 @@ public interface IStIvtIostorinvCpOutService extends IService<StIvtIostorinvCp>
* }
*/
void confirm(JSONObject whereJson);
/**
* 获取手工分配库存
* @param whereJson
* {
* 明细row
* }
*/
List getStructIvt(JSONObject whereJson);
}

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
View File

@@ -473,6 +473,16 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
}
@Override
public List getStructIvt(JSONObject whereJson) {
JSONObject param = new JSONObject();
param.put("materia_id", whereJson.getString("materia_id"));
param.put("stor_id", whereJson.getString("stor_id"));
if (ObjectUtil.isNotEmpty(whereJson.getString("sale_id"))) param.put("sale_id", whereJson.getString("sale_id"));
return iStIvtStructivtCpService.getStructIvt(param);
}
@NotNull
private StIvtIostorinvCp packageMstForm(StIvtIostorinvCp stIvtIostorinvCp,JSONObject whereJson,Boolean isUpdate) {
JSONArray rows = whereJson.getJSONArray("tableData");

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
View File

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
import java.util.List;
/**
* <p>
* 仓位库存表 服务类
@@ -37,4 +39,12 @@ public interface IStIvtStructivtCpService extends IService<StIvtStructivtCp> {
*/
StIvtStructivtCp queryIvtOutOne(JSONObject json);
/**
* 获取手工分配库存
* @param whereJson
* {
* 明细row
* }
*/
List getStructIvt(JSONObject whereJson);
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
View File

@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp;
import java.util.List;
import java.util.Map;
/**
* <p>
* 仓位库存表 Mapper 接口
@@ -16,4 +19,6 @@ public interface StIvtStructivtCpMapper extends BaseMapper<StIvtStructivtCp> {
StIvtStructivtCp queryIvtOutOne(JSONObject json);
List<Map> getStructIvt(JSONObject json);
}

23
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
View File

@@ -26,4 +26,27 @@
LIMIT 1
</select>
<select id="getStructIvt" resultType="java.util.Map">
SELECT
ivt.*
FROM
ST_IVT_StructIvt_CP ivt
LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id
WHERE attr.lock_type = '0'
<if test="stor_id != null and stor_id != ''">
and attr.stor_id = #{stor_id}
</if>
<if test="sect_id != null and sect_id != ''">
and attr.sect_id = #{sect_id}
</if>
<if test="material_id != null and material_id != ''">
and ivt.material_id = #{material_id}
</if>
<if test="sale_id != null and sale_id != ''">
and ivt.sale_id = #{sale_id}
</if>
order by ivt.canuse_qty ASC,ivt.struct_code ASC
</select>
</mapper>

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
View File

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
@@ -85,6 +86,11 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl<StIvtStructivtCpMap
return baseMapper.queryIvtOutOne(json);
}
@Override
public List getStructIvt(JSONObject whereJson) {
return baseMapper.getStructIvt(whereJson);
}
/*
加待入
*/

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/moveOrLess/StIvtMoreorlessmstYlController.java
View File

@@ -5,16 +5,13 @@ import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import org.nl.common.anno.Log;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.IStIvtMoreorlessmstYlService;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.dto.MoreOrlessQuery;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dto.MoreOrlessQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
* <p>
* 损溢单主表 前端控制器

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckmstYlServiceImpl.java
View File

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import io.jsonwebtoken.lang.Assert;
import org.jetbrains.annotations.NotNull;
import org.nl.common.TableDataInfo;
@@ -24,15 +23,12 @@ import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrServ
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
import org.nl.wms.storage_manage.CHECKEnum;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckdtlYlService;
import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckmstYlService;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper.StIvtCheckmstYlMapper;
import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.IStIvtMoreorlessmstYlService;
import org.nl.wms.storage_manage.semimanage.MLEnum;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +36,6 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Stream;
/**
* <p>

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/moveOrLess/IStIvtMoreorlessmstYlService.java
View File

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.StIvtMoreorlessmstYl;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.dto.MoreOrlessQuery;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dto.MoreOrlessQuery;
import java.util.List;
import java.util.Map;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/moveOrLess/dao/mapper/StIvtMoreorlessmstYlMapper.java
View File

@@ -4,7 +4,7 @@ import org.apache.ibatis.annotations.Param;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.StIvtMoreorlessmstYl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.dto.MoreOrlessQuery;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dto.MoreOrlessQuery;
import java.util.List;
import java.util.Map;

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/moveOrLess/dto/MoreOrlessQuery.java
View File

@@ -1,10 +1,9 @@
package org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.dto;
package org.nl.wms.storage_manage.rawmanage.service.moveOrLess.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.rawmanage.service.check.dao.StIvtCheckmstYl;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.StIvtMoreorlessmstYl;
/*

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/moveOrLess/impl/StIvtMoreorlessmstYlServiceImpl.java
View File

@@ -24,13 +24,11 @@ import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrServ
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
import org.nl.wms.storage_manage.CHECKEnum;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dto.MoreOrlessQuery;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.IStIvtMoreorlessdtlYlService;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.IStIvtMoreorlessmstYlService;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.StIvtMoreorlessdtlYl;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.StIvtMoreorlessmstYl;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.dto.MoreOrlessQuery;
import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dao.mapper.StIvtMoreorlessmstYlMapper;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl;