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

rev：新增原材料盘点、损溢；老车间包装

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-05-26 16:24:02 +08:00
parent 1ce759c718
commit 40ec3496ff
37 changed files with 1299 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml
View File

@@ -42,5 +42,8 @@
<if test="sect_type_attr != null and stor_id != ''">
and st_ivt_sectattr.sect_type_attr = #{sect_type_attr}
</if>
<if test="stor_type != null and stor_type != ''">
and stor.stor_type = #{stor_type}
</if>
</select>
</mapper>

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java
View File

@@ -20,6 +20,7 @@ public class StructarrQuery extends BaseQuery<StIvtStructattr> {
private String is_productstore;
private String is_semi_finished;
private String is_virtualstore;
private String sect_id;
@Override
public void paramMapping() {

45
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHECKEnum.java Normal file
View File

@@ -0,0 +1,45 @@
package org.nl.wms.storage_manage;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.utils.MapOf;
import org.nl.modules.common.exception.BadRequestException;
import java.util.Map;
/*
* @author ZZQ
* @Date 2023/5/4 20:11
*/
@AllArgsConstructor
@Getter
public enum CHECKEnum {
//单据类型
BILL_TYPE(MapOf.of("计划盘点", "31", "临时盘点", "32")),
//单据状态
BILL_STATUS(MapOf.of("生成", "10", "盘点中", "30", "完成", "99")),
//单据状态
DTL_STATUS(MapOf.of("生成", "01", "盘点中", "04", "已盘点", "05", "异常处理中", "06", "异常处理完成"
, "07", "确认完成", "99")),
PROCESS_TYPE(MapOf.of("账务为准", "0", "实盘为准", "1")),
CREATE_MODE(MapOf.of("PC产生", "01", "终端产生", "02", "外部接口产生", "03", "内部调度产生", "04"));
private Map<String, String> code;
public String code(String desc) {
String code = this.getCode().get(desc);
if (StringUtils.isNotEmpty(code)) {
return code;
}
throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
}
public String check(String code) {
for (Map.Entry<String, String> entry : this.getCode().entrySet()) {
if (entry.getValue().equals("code")) {
return entry.getValue();
}
}
throw new BadRequestException(this.name() + "对应类型" + code + "未定义");
}
}

88
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java
View File

@@ -1,9 +1,16 @@
package org.nl.wms.storage_manage.rawmanage.controller.check;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.IStIvtCheckmstYlService;
import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -14,8 +21,81 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2023-05-10
*/
@RestController
@RequestMapping("/stIvtCheckmstYl")
@RequestMapping("/api/check")
public class StIvtCheckmstYlController {
@Autowired
private IStIvtCheckmstYlService checkmstYlService;
@GetMapping
@Log("查询原料入库单")
@ApiOperation("查询原料入库单")
public ResponseEntity<Object> query(CheckQuery query, PageQuery page) {
return new ResponseEntity<>(checkmstYlService.pageQuery(query, page), HttpStatus.OK);
}
@PostMapping
@Log("创建盘点单")
@ApiOperation("创建盘点单")
public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
checkmstYlService.create(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/getCheckDtl")
@Log("查询盘点明细")
@ApiOperation("查询盘点明细")
public ResponseEntity<Object> getCheckDtl(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(checkmstYlService.getCheckDtl(whereJson), HttpStatus.OK);
}
@PostMapping("/update")
@Log("修改盘点单")
@ApiOperation("修改盘点单")
public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
checkmstYlService.update(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/delete")
@Log("删除入库单")
@ApiOperation("删除入库单")
public ResponseEntity<Object> delete(@RequestBody Long[] ids){
checkmstYlService.delete(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/saveCheck")
@Log("盘点保存")
@ApiOperation("盘点保存")
public ResponseEntity<Object> saveCheck(@RequestBody JSONObject whereJson) {
checkmstYlService.saveCheck(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/confirm")
@Log("移库单强制确认")
@ApiOperation("移库单强制确认")
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
checkmstYlService.confirm(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/process1")
@Log("实盘为准，生成损溢单修改库存")
@ApiOperation("实盘为准，生成损溢单修改库存")
public ResponseEntity<Object> process1(@RequestBody JSONObject whereJson) {
checkmstYlService.process1(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/process0")
@Log("账务为准")
@ApiOperation("账务为准")
public ResponseEntity<Object> process0(@RequestBody JSONObject whereJson) {
checkmstYlService.process0(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java
View File

@@ -10,6 +10,7 @@ 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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -31,8 +32,15 @@ public class StIvtStructivtYlController {
@GetMapping("/getRawIvt")
@Log("查询可用的原料库存")
@ApiOperation("查询可用的原料库存")
public ResponseEntity<Object> getRawIvt(StructIvtYLQuery query, PageQuery page){
return new ResponseEntity<>(structivtYlService.getRawIvt(query,page), HttpStatus.OK);
public ResponseEntity<Object> getRawIvt(StructIvtYLQuery query, PageQuery page) {
return new ResponseEntity<>(structivtYlService.getRawIvt(query, page), HttpStatus.OK);
}
@PostMapping("/getStructIvt")
@Log("查询库存")
@ApiOperation("查询库存")
public ResponseEntity<Object> getStructIvt(StructIvtYLQuery query) {
return new ResponseEntity<>(structivtYlService.getStructIvt(query), HttpStatus.OK);
}
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckdtlYlService.java
View File

@@ -1,7 +1,13 @@
package org.nl.wms.storage_manage.rawmanage.service.check;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -13,4 +19,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IStIvtCheckdtlYlService extends IService<StIvtCheckdtlYl> {
/**
* 主单据使用
* @param row
* @param mst
* @return
*/
double create(JSONArray row, StIvtCheckmstYl mst);
List<Map> getCheckDtl(JSONObject map);
}

39
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckmstYlService.java
View File

@@ -1,7 +1,14 @@
package org.nl.wms.storage_manage.rawmanage.service.check;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -13,4 +20,36 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IStIvtCheckmstYlService extends IService<StIvtCheckmstYl> {
/**
* 分页查询
* @param query,page /
* @return JSONObject
*/
Object pageQuery(CheckQuery query, PageQuery page);
void create(JSONObject jo);
List<Map> getCheckDtl(JSONObject map);
void update(JSONObject map);
/**
* 删除
* @param ids
* {
* 主表id..
* }
*/
void delete(Long[] ids);
void saveCheck(JSONObject jo);
void confirm(JSONObject jo);
void process0(JSONObject jo);
void process1(JSONObject jo);
}

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckdtlYl.java
View File

@@ -1,6 +1,8 @@
package org.nl.wms.storage_manage.rawmanage.service.check.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.io.Serializable;
@@ -25,6 +27,7 @@ public class StIvtCheckdtlYl implements Serializable {
/**
* 盘点单明细id
*/
@TableId(value = "checkdtl_id")
private String checkdtl_id;
/**
@@ -115,7 +118,7 @@ public class StIvtCheckdtlYl implements Serializable {
/**
* 盘点结果
*/
private Boolean check_result;
private String check_result;
/**
* 盘点人
@@ -130,7 +133,7 @@ public class StIvtCheckdtlYl implements Serializable {
/**
* 盘点时间
*/
private Date check_time;
private String check_time;
/**
* 异常是否处理
@@ -150,7 +153,7 @@ public class StIvtCheckdtlYl implements Serializable {
/**
* 处理时间
*/
private Date process_time;
private String process_time;
}

13
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckmstYl.java
View File

@@ -1,6 +1,8 @@
package org.nl.wms.storage_manage.rawmanage.service.check.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.io.Serializable;
@@ -25,6 +27,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 盘点单标识
*/
@TableId(value = "check_id")
private String check_id;
/**
@@ -75,7 +78,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 创建时间
*/
private Date create_time;
private String create_time;
/**
* 审核人
@@ -90,7 +93,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 审核时间
*/
private Date audit_time;
private String audit_time;
/**
* 确认人
@@ -105,7 +108,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 确认时间
*/
private Date confirm_time;
private String confirm_time;
/**
* 备注
@@ -145,7 +148,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 回传时间
*/
private Date upload_time;
private String upload_time;
/**
* 部门ID
@@ -160,7 +163,7 @@ public class StIvtCheckmstYl implements Serializable {
/**
* 车间标识
*/
private String product_area;
private String workshop_id;
}

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

@@ -1,8 +1,12 @@
package org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* <p>
* 盘点单明细表 Mapper 接口
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface StIvtCheckdtlYlMapper extends BaseMapper<StIvtCheckdtlYl> {
List<Map> getCheckDtl(@Param("map") Map map);
}

33
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/xml/StIvtCheckdtlYlMapper.xml
View File

@@ -2,4 +2,37 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper.StIvtCheckdtlYlMapper">
<select id="getCheckDtl" resultType="java.util.Map">
SELECT
CheckDtl.*,
struct.struct_code,
struct.sect_code,
mb.material_code,
mb.material_name,
user1.person_name AS process_optname
FROM
st_ivt_checkdtl_yl CheckDtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = CheckDtl.material_id
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = CheckDtl.struct_id
LEFT JOIN sys_user user1 ON user1.user_id = CheckDtl.process_optid
<where>
1=1
<if test="map.check_id != '' and map.check_id != null">
and CheckDtl.check_id = #{map.check_id}
</if>
<if test="map.checkdtl_id != '' and map.checkdtl_id != null">
and CheckDtl.checkdtl_id = #{map.checkdtl_id}
</if>
<if test="map.status != '' and map.status != null">
and #{map.status} >= CheckDtl.status
</if>
<if test="map.check_result != '' and map.check_result != null and map.check_result != '-1'">
and #{map.check_result} = CheckDtl.check_result
</if>
<if test="map.check_result == '-1'">
and CheckDtl.check_result IN ('1','2')
</if>
</where>
order by CheckDtl.seq_no
</select>
</mapper>

34
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dto/CheckQuery.java Normal file
View File

@@ -0,0 +1,34 @@
package org.nl.wms.storage_manage.rawmanage.service.check.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;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class CheckQuery extends BaseQuery<StIvtCheckmstYl> {
private String stor_id;
private String status;
private String check_type;
private String check_code;
private Boolean is_delete = false;
@Override
public void paramMapping() {
super.doP.put("check_code", QParam.builder().k(new String[]{"check_code"}).type(QueryTEnum.LK).build());
}
}

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

@@ -1,11 +1,33 @@
package org.nl.wms.storage_manage.rawmanage.service.check.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
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.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.StIvtCheckdtlYlMapper;
import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckdtlYlService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* <p>
* 盘点单明细表 服务实现类
@@ -17,4 +39,56 @@ import org.springframework.stereotype.Service;
@Service
public class StIvtCheckdtlYlServiceImpl extends ServiceImpl<StIvtCheckdtlYlMapper, StIvtCheckdtlYl> implements IStIvtCheckdtlYlService {
@Autowired
private IStIvtSectattrService sectattrService;
@Autowired
private IStIvtStructattrService structattrService;
@Override
public double create(JSONArray rows, StIvtCheckmstYl mst) {
double total_qty = 0;
if (rows.size() > 0 && ObjectUtil.isNotEmpty(mst)) {
// 先删除在插入
this.remove(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", mst.getCheck_id()));
for (int i = 0; i < rows.size(); i++) {
String checkdtl_id = IdUtil.getStringId();
StIvtCheckdtlYl row = rows.getJSONObject(i).toJavaObject(StIvtCheckdtlYl.class);
row.setCheckdtl_id(checkdtl_id);
row.setCheck_id(mst.getCheck_id());
row.setCheck_code(mst.getCheck_code());
row.setSeq_no(BigDecimal.valueOf(i + 1));
// 获取库区信息
QueryWrapper<StIvtSectattr> sect_wrapper = new QueryWrapper<>();
sect_wrapper.eq("sect_id", row.getSect_id());
sect_wrapper.eq("is_used", true);
StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper);
if (ObjectUtil.isEmpty(sectDao)) throw new BadRequestException("库区不存在或未启用！");
row.setSect_name(sectDao.getSect_name());
// 获取仓位信息
QueryWrapper<StIvtStructattr> struct_wrapper = new QueryWrapper<>();
struct_wrapper.eq("struct_id", row.getStruct_id());
struct_wrapper.eq("is_used", true);
StIvtStructattr structDao = structattrService.getOne(struct_wrapper);
if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！");
row.setStruct_name(structDao.getStruct_name());
row.setStoragevehicle_id("999999");
row.setStoragevehicle_code("999999");
row.setStatus(CHECKEnum.DTL_STATUS.code("生成"));
this.save(row);
//锁定货位
structattrService.update(new UpdateWrapper<StIvtStructattr>().set("lock_type", "1").set("inv_code",mst.getCheck_code()).eq("struct_id", row.getStruct_id()));
}
}
return total_qty;
}
@Override
public List<Map> getCheckDtl(JSONObject map) {
return this.baseMapper.getCheckDtl(map);
}
}

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

@@ -1,11 +1,44 @@
package org.nl.wms.storage_manage.rawmanage.service.check.impl;
import cn.hutool.core.date.DateUtil;
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 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;
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.modules.system.util.CodeUtil;
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.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.IStIvtCheckmstYlService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Stream;
/**
* <p>
* 盘点单主表 服务实现类
@@ -17,4 +50,259 @@ import org.springframework.stereotype.Service;
@Service
public class StIvtCheckmstYlServiceImpl extends ServiceImpl<StIvtCheckmstYlMapper, StIvtCheckmstYl> implements IStIvtCheckmstYlService {
@Autowired
private IStIvtBsrealstorattrService stIvtBsrealstorattrService;
@Autowired
private IStIvtCheckdtlYlService checkdtlYlService;
@Autowired
private IStIvtStructattrService structattrService;
@Override
public Object pageQuery(CheckQuery query, PageQuery page) {
// 查询条件
page.setSort("check_code,ASC");
// 分页查询
Page<StIvtCheckmstYl> pageQuery = this.page(page.build(), query.build());
TableDataInfo<StIvtCheckmstYl> build = TableDataInfo.build(pageQuery);
return build;
}
@Override
public void create(JSONObject form) {
JSONArray rows = form.getJSONArray("tableData");
if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
// 调用主表 插入/更新方法
StIvtCheckmstYl checkmstYl = packageMstForm(new StIvtCheckmstYl(), form);
this.save(checkmstYl);
//调用明细表 插入方法
checkdtlYlService.create(rows, checkmstYl);
}
@Override
public List<Map> getCheckDtl(JSONObject map) {
return checkdtlYlService.getCheckDtl(map);
}
@Override
public void update(JSONObject form) {
Assert.notNull(new Object[]{form, form.get("check_id")}, "请求参数不能为空");
StIvtCheckmstYl mst = form.toJavaObject(StIvtCheckmstYl.class);
this.updateById(mst);
JSONArray rows = form.getJSONArray("tableData");
if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
// 调用明细表 插入/更新方法
checkdtlYlService.create(rows, mst);
}
@Override
public void saveCheck(JSONObject whereJson) {
JSONObject form = whereJson.getJSONObject("row");
JSONArray rows = whereJson.getJSONArray("rows");
StIvtCheckmstYl jo_mst = this.getOne(new QueryWrapper<StIvtCheckmstYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"10", "30"}));
if (jo_mst == null) {
throw new BadRequestException("盘点单状态异常！");
}
checkdtlYlService.remove(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"01", "04"}));
for (int i = 0; i < rows.size(); i++) {
JSONObject jo = rows.getJSONObject(i);
String status = jo.getString("status");
StIvtCheckdtlYl dtl = jo.toJavaObject(StIvtCheckdtlYl.class);
double base_qty = jo.getDoubleValue("base_qty");
dtl.setSeq_no(BigDecimal.valueOf(i + 1));
//已盘点过的明细不再处理
if ("05,06,07,99".contains(status)) {
checkdtlYlService.updateById(dtl);
continue;
}
dtl.setStatus(CHECKEnum.DTL_STATUS.code("盘点中"));
dtl.setCheck_optid(SecurityUtils.getCurrentUserId());
dtl.setCheck_optname(SecurityUtils.getCurrentNickName());
dtl.setCheck_time(DateUtil.now());
double fac_qty = jo.getDoubleValue("fac_qty");
//判断盈亏
if (fac_qty > base_qty) {
dtl.setCheck_result("2");
} else if (fac_qty < base_qty) {
dtl.setCheck_result("1");
} else {
dtl.setCheck_result("0");
}
if (StrUtil.isEmpty(jo.getString("checkdtl_id"))) {
jo.put("checkdtl_id", IdUtil.getStringId());
}
checkdtlYlService.save(dtl);
}
jo_mst.setDtl_num(BigDecimal.valueOf(rows.size()));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("盘点中"));
jo_mst.setIs_nok(false);
List<StIvtCheckdtlYl> dtl_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).ne("check_result", "0"));
if (dtl_list.size() != 0) {
jo_mst.setIs_nok(true);
}
this.updateById(jo_mst);
}
@Override
public void confirm(JSONObject whereJson) {
JSONObject form = whereJson.getJSONObject("row");
JSONArray rows = whereJson.getJSONArray("rows");
StIvtCheckmstYl jo_mst = this.getOne(new QueryWrapper<StIvtCheckmstYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"10", "30"}));
if (jo_mst == null) {
throw new BadRequestException("盘点单状态异常！");
}
checkdtlYlService.remove(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"01", "04"}));
//定义需要需要更新的的点位集合
HashSet<String> set = new HashSet<>();
for (int i = 0; i < rows.size(); i++) {
JSONObject jo = rows.getJSONObject(i);
String status = jo.getString("status");
StIvtCheckdtlYl dtl = jo.toJavaObject(StIvtCheckdtlYl.class);
double base_qty = jo.getDoubleValue("base_qty");
dtl.setSeq_no(BigDecimal.valueOf(i + 1));
//已盘点过的明细不再处理
if ("05,06,07,99".contains(status)) {
checkdtlYlService.updateById(dtl);
continue;
}
dtl.setStatus(CHECKEnum.DTL_STATUS.code("已盘点"));
dtl.setCheck_optid(SecurityUtils.getCurrentUserId());
dtl.setCheck_optname(SecurityUtils.getCurrentNickName());
dtl.setCheck_time(DateUtil.now());
double fac_qty = jo.getDoubleValue("fac_qty");
//判断盈亏
if (fac_qty > base_qty) {
dtl.setCheck_result("2");
} else if (fac_qty < base_qty) {
dtl.setCheck_result("1");
} else {
dtl.setCheck_result("0");
dtl.setStatus(CHECKEnum.DTL_STATUS.code("确认完成"));
}
if (StrUtil.isEmpty(jo.getString("checkdtl_id"))) {
jo.put("checkdtl_id", IdUtil.getStringId());
}
checkdtlYlService.save(dtl);
set.add(dtl.getStruct_id());
}
jo_mst.setDtl_num(BigDecimal.valueOf(rows.size()));
jo_mst.setIs_nok(false);
List<StIvtCheckdtlYl> dtl_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).ne("check_result", "0"));
if (dtl_list.size() != 0) {
jo_mst.setIs_nok(true);
}
List<StIvtCheckdtlYl> finish_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"99", "07"}));
//说明全部确认
if (finish_list.size() == jo_mst.getDtl_num().intValue()) {
checkdtlYlService.update(new UpdateWrapper<StIvtCheckdtlYl>().set("status", "99").eq("check_id", form.getString("check_id")));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//锁定起点点位、仓位
set.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("lock_type", "0").set("inv_code", "").eq("struct_id", struct_id)));
}
this.updateById(jo_mst);
}
@Override
public void process0(JSONObject whereJson) {
JSONObject form = whereJson.getJSONObject("form");
JSONObject row = whereJson.getJSONObject("row");
StIvtCheckmstYl jo_mst = this.getOne(new QueryWrapper<StIvtCheckmstYl>().eq("check_id", form.getString("check_id")).ne("status", "99"));
if (jo_mst == null) {
throw new BadRequestException("盘点单状态异常！");
}
StIvtCheckdtlYl dtl = row.toJavaObject(StIvtCheckdtlYl.class);
dtl.setStatus(CHECKEnum.DTL_STATUS.code("确认完成"));
dtl.setProcess_optid(SecurityUtils.getCurrentUserId());
dtl.setProcess_time(DateUtil.now());
dtl.setProcess_type(CHECKEnum.PROCESS_TYPE.code("账务为准"));
dtl.setIs_process(true);
checkdtlYlService.updateById(dtl);
List<StIvtCheckdtlYl> finish_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", form.getString("check_id")).in("status", new String[]{"99", "07"}));
//说明全部确认
if (finish_list.size() == jo_mst.getDtl_num().intValue()) {
checkdtlYlService.update(new UpdateWrapper<StIvtCheckdtlYl>().set("status", "99").eq("check_id", form.getString("check_id")));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//解锁起点点位、仓位
finish_list.stream()
.map(finish -> finish.getStruct_id())
.distinct()
.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id)));
}
this.updateById(jo_mst);
}
@Override
public void process1(JSONObject jo) {
}
@Override
public void delete(Long[] ids) {
for (Long id : ids) {
StIvtCheckmstYl dao = this.getOne(new QueryWrapper<StIvtCheckmstYl>().eq("check_id", id));
dao.setIs_delete(true);
//获取所有明细下的仓位解锁
List<StIvtCheckdtlYl> dtl_list = checkdtlYlService.list(new QueryWrapper<StIvtCheckdtlYl>().eq("check_id", id));
dtl_list.stream()
.map(dtl -> dtl.getStruct_id())
.distinct()
.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id)));
this.updateById(dao);
}
}
@NotNull
private StIvtCheckmstYl packageMstForm(StIvtCheckmstYl checkmstYl, JSONObject whereJson) {
JSONArray rows = whereJson.getJSONArray("tableData");
// 新增
checkmstYl.setCheck_id(IdUtil.getStringId());
checkmstYl.setCheck_code(CodeUtil.getNewCode("PD_CODE"));
checkmstYl.setBuss_type(whereJson.getString("check_type"));
checkmstYl.setCheck_type(checkmstYl.getBuss_type());
// 获取仓库信息
QueryWrapper<StIvtBsrealstorattr> wrapper = new QueryWrapper<>();
wrapper.eq("stor_id", whereJson.getString("stor_id"));
wrapper.eq("is_used", true);
StIvtBsrealstorattr bsrealDao = stIvtBsrealstorattrService.getOne(wrapper);
if (ObjectUtil.isEmpty(bsrealDao)) throw new BadRequestException("仓库不存在或未启用！");
checkmstYl.setStor_id(bsrealDao.getStor_id());
checkmstYl.setStor_name(bsrealDao.getStor_name());
checkmstYl.setDtl_num(BigDecimal.valueOf(rows.size()));
checkmstYl.setCreate_mode(CHECKEnum.CREATE_MODE.code("PC产生"));
checkmstYl.setStatus(CHECKEnum.BILL_STATUS.code("生成"));
checkmstYl.setCreate_id(SecurityUtils.getCurrentUserId());
checkmstYl.setCreate_name(SecurityUtils.getCurrentNickName());
checkmstYl.setCreate_time(DateUtil.now());
checkmstYl.setIs_delete(false);
checkmstYl.setIs_upload(true);
// TODO 暂时写死
checkmstYl.setSysdeptid("111");
checkmstYl.setSyscompanyid("111");
checkmstYl.setRemark(whereJson.getString("remark"));
checkmstYl.setWorkshop_id(whereJson.getString("workshop_id"));
return checkmstYl;
}
}

58
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java
View File

@@ -1,7 +1,9 @@
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;
@@ -19,7 +21,9 @@ import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
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.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService;
import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
import org.nl.wms.storage_manage.IOSEnum;
@@ -41,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -74,10 +79,10 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
private IStIvtStructivtYlService structivtYlService;
@Autowired
private IPcsIfPurchaseorderService purchaseorderService;
private IMdMeMaterialbaseService materialbaseService;
@Autowired
private IMdMeMaterialbaseService materialbaseService;
private IStIvtStructattrService structattrService;
@Override
@@ -170,23 +175,58 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
for (StIvtStructivtYl ivt : list) {
//判断是否需要继续分配库存，不大于0时跳出循环
if (need_qty > 0){
if (need_qty > 0) {
double canuse_qty = ivt.getCanuse_qty().doubleValue();
if (canuse_qty >= need_qty){
//插入分配表
//插入分配表
String s = JSON.toJSONString(dtl);
JSONObject dis = JSONObject.parseObject(s);
StIvtStructattr structattr = structattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_id", ivt.getStruct_id()));
dis.put("struct_id", structattr.getStruct_id());
dis.put("struct_code", structattr.getStruct_code());
dis.put("struct_name", structattr.getStruct_name());
dis.put("sect_id", structattr.getSect_id());
dis.put("sect_code", structattr.getSect_code());
dis.put("sect_name", structattr.getSect_name());
if (canuse_qty > need_qty) {
dis.put("plan_qty", need_qty);
dis.put("real_qty", need_qty);
//减去库存
double sub = NumberUtil.sub(canuse_qty, need_qty);
ivt.setCanuse_qty(BigDecimal.valueOf(sub));
ivt.setIvt_qty(BigDecimal.valueOf(sub));
structivtYlService.updateById(ivt);
//维护库存
need_qty = 0;
} else {
dis.put("plan_qty", canuse_qty);
dis.put("real_qty", canuse_qty);
structivtYlService.remove(new QueryWrapper<StIvtStructivtYl>().eq("stockrecord_id", ivt.getStockrecord_id()));
need_qty = NumberUtil.sub(need_qty - canuse_qty).doubleValue();
}
}else {
JSONObject mst_jo = new JSONObject();
mst_jo.put("mst_id", dtl.getIostorinv_id());
mst_jo.put("dtl_id", dtl.getIostorinv_id());
iostorinvdisYlService.create(dis, mst_jo);
//维护库存
} else {
break;
}
}
if (need_qty > 0){
throw new BadRequestException("物料:"+mater.getMaterial_name()+"库存不足，缺少："+need_qty+"KG");
if (need_qty > 0) {
throw new BadRequestException("物料:" + mater.getMaterial_name() + "库存不足，缺少：" + need_qty + "KG");
}
});
List<StIvtIostorinvdisYl> dis_list = iostorinvdisYlService.list(new QueryWrapper<StIvtIostorinvdisYl>().eq("iostorinv_id", iostorinv_id));
//修改分配状态
dis_list.forEach(dis -> {
dis.setWork_status(IOSEnum.WORK_STATUS.code("完成"));
iostorinvdisYlService.updateById(dis);
});
}
@NotNull

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

@@ -20,10 +20,7 @@ import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService;
import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto;
import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService;
@@ -35,7 +32,6 @@ import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIos
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.dao.StIvtStructivtYl;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java
View File

@@ -56,6 +56,27 @@ public class StIvtIostorinvdisYlServiceImpl extends ServiceImpl<StIvtIostorinvdi
row.setWork_status(IOSEnum.WORK_STATUS.code("未生成"));
row.setPlan_qty(row.getPlan_qty());
// 获取库区信息
QueryWrapper<StIvtSectattr> sect_wrapper = new QueryWrapper<>();
sect_wrapper.eq("sect_id", row.getSect_id());
sect_wrapper.eq("is_used", true);
StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper);
if (ObjectUtil.isEmpty(sectDao)) throw new BadRequestException("库区不存在或未启用！");
row.setSect_code(sectDao.getSect_code());
row.setSect_name(sectDao.getSect_name());
// 获取仓位信息
QueryWrapper<StIvtStructattr> struct_wrapper = new QueryWrapper<>();
struct_wrapper.eq("struct_id", row.getStruct_id());
struct_wrapper.eq("is_used", true);
StIvtStructattr structDao = structattrService.getOne(struct_wrapper);
if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！");
row.setStruct_code(structDao.getStruct_code());
row.setStruct_name(structDao.getStruct_name());
row.setPcsn(DateUtil.today());
this.save(row);
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/IStIvtStructivtYlService.java
View File

@@ -6,6 +6,9 @@ import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtY
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
* 仓位库存表 服务类
@@ -23,4 +26,6 @@ public interface IStIvtStructivtYlService extends IService<StIvtStructivtYl> {
* @return JSONObject
*/
Object getRawIvt(StructIvtYLQuery query, PageQuery page);
List<Map> getStructIvt(StructIvtYLQuery query);
}

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

@@ -21,4 +21,6 @@ import java.util.Map;
public interface StIvtStructivtYlMapper extends BaseMapper<StIvtStructivtYl> {
List<Map> getRawIvt(@Param("query") StructIvtYLQuery query, @Param("pageQuery") PageQuery pageQuery);
List<Map> getStructIvt(@Param("query") StructIvtYLQuery query);
}

38
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml
View File

@@ -23,7 +23,8 @@
LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
<where>
ivt.canuse_qty > 0
AND
sa.lock_type = '0'
<if test="query.material_search != null and query.material_search != ''">
and (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search})
</if>
@@ -35,4 +36,39 @@
</if>
</where>
</select>
<select id="getStructIvt" resultType="java.util.Map">
SELECT
ivt.*,
mu.unit_name AS qty_unit_name,
mb.material_code,
mb.material_name,
sa.sect_id,
sa.sect_code,
sa.sect_name,
sa.struct_id,
sa.struct_code,
sa.struct_name,
class.class_name
FROM
st_ivt_structivt_yl ivt
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
LEFT JOIN st_ivt_structattr sa ON sa.struct_id = ivt.struct_id
LEFT JOIN md_pb_measureunit mu ON mu.measure_unit_id = ivt.qty_unit_id
LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
<where>
ivt.canuse_qty > 0
AND
sa.lock_type = '0'
<if test="query.material_search != null and query.material_search != ''">
and (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search})
</if>
<if test="query.sect_id != null and query.sect_id != ''">
and sa.sect_id = #{query.sect_id}
</if>
<if test="query.struct_id != null and query.struct_id != ''">
and sa.struct_id = #{query.struct_id}
</if>
</where>
</select>
</mapper>

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

@@ -37,4 +37,9 @@ public class StIvtStructivtYlServiceImpl extends ServiceImpl<StIvtStructivtYlMap
build.setTotalElements(page.getTotal());
return build;
}
@Override
public List<Map> getStructIvt(StructIvtYLQuery query) {
return structivtYlMapper.getStructIvt(query);
}
}