Skip to content

E
erp-service
Commit 78fdbc62 authored by 李驰骋's avatar 李驰骋 Committed by chicheng
Browse files
Options

添加批次号管理 

(cherry picked from commit 51d3068f)
parent 9d4919cc
Show whitespace changes
Inline Side-by-side
Showing with 217 additions and 1689 deletions
erp-system/src/main/java/com/topsunit/scanservice/ximai/common/Constants.java
View file @ 78fdbc62
......@@ -56,6 +56,11 @@ public class Constants {
*/
public static final String LOGIN_FAIL = "Error";
/**
* 默认批号
*/
public static final String BATCH_DEF = Constants.BATCH_DEF;
/**
* 验证码 redis key
*/
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/controller/MoctaController.java
View file @ 78fdbc62
......@@ -40,6 +40,11 @@ public class MoctaController {
Optional<MoctaDocDto> getForDoc(@RequestBody MoctaIdCriteria criteria){
return moctaService.getForDoc(criteria);
}
@ApiOperation("获取工单信息")
@PostMapping("/mocta/get")
Optional<MoctaDto> get(@RequestBody MoctaIdCriteria criteria){
return moctaService.get(criteria);
}
@ApiOperation("获取文件列表")
@PostMapping("/mocta/getfordocList")
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/CopthCreateParams.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.dto;
import com.topsunit.scanservice.ximai.common.Constants;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -47,7 +48,7 @@ public class CopthCreateParams {
@ApiModelProperty("订单序号")
private String th016;
@ApiModelProperty("批号")
private String th017="********************";
private String th017= Constants.BATCH_DEF;
@ApiModelProperty("备注")
private String th018;
@ApiModelProperty("客户品号")
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/IInvmlDto.java
View file @ 78fdbc62
......@@ -33,4 +33,7 @@ public interface IInvmlDto {
@ApiModelProperty("库存数量")
public BigDecimal getMl005();
@ApiModelProperty("最近入库日")
public String getMl009();
}
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/InvmlDto.java
View file @ 78fdbc62
......@@ -43,4 +43,9 @@ public class InvmlDto {
*/
@ApiModelProperty("库存数量")
private BigDecimal ml005;
/**
* 最近入库日
*/
@ApiModelProperty("最近入库日")
private String ml009;
}
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/InvtaCreateParams.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.dto;
import com.topsunit.scanservice.ximai.common.Constants;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -73,5 +74,5 @@ public class InvtaCreateParams {
@ApiModelProperty("单据来源")
private String ta025="1";
@ApiModelProperty("批号")
private String ta033="********************";
private String ta033= Constants.BATCH_DEF;
}
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/InvtbCreateParams.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.dto;
import com.topsunit.scanservice.ximai.common.Constants;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -44,7 +45,7 @@ public class InvtbCreateParams {
@ApiModelProperty("转入库")
private String tb013="";
@ApiModelProperty("批号")
private String tb014="********************";
private String tb014= Constants.BATCH_DEF;
@ApiModelProperty("有效日期")
private String tb015="";
@ApiModelProperty("复检日期")
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/InvtbCreateParamsAllo.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.dto;
import com.topsunit.scanservice.ximai.common.Constants;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -43,7 +44,7 @@ public class InvtbCreateParamsAllo {
@ApiModelProperty("转入库")
private String tb013="";
@ApiModelProperty("批号")
private String tb014="********************";
private String tb014= Constants.BATCH_DEF;
@ApiModelProperty("有效日期")
private String tb015="";
@ApiModelProperty("复检日期")
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/MoctaDto.java
View file @ 78fdbc62
......@@ -22,11 +22,11 @@ public class MoctaDto {
private String ta003;
/*BOM日期[FORMATE:YMD]*/
private String ta004;
/*BOM版本*/
@ApiModelProperty("BOM版本")
private String ta005;
/*产品品号*/
@ApiModelProperty("产品品号")
private String ta006;
/*单位*/
@ApiModelProperty("单位")
private String ta007;
/*预留字段 小单位*/
private String ta008;
......@@ -41,16 +41,17 @@ public class MoctaDto {
/*审核码 Y、N、V*/
private String ta013;
/*实际完工[FORMATE:YMD]*/
@ApiModelProperty("实际完工[FORMATE:YMD]")
private String ta014;
/*预计产量*/
@ApiModelProperty("预计产量")
private BigDecimal ta015;
/*已领套数*/
@ApiModelProperty("已领套数")
private BigDecimal ta016;
/*已生产量*/
@ApiModelProperty("已生产量")
private BigDecimal ta017;
/*报废数量*/
private BigDecimal ta018;
/*工厂编号*/
@ApiModelProperty("工厂编号")
private String ta019;
/*入库仓库*/
private String ta020;
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/MoctfCreateParams2.java
View file @ 78fdbc62
......@@ -29,6 +29,8 @@ public class MoctfCreateParams2 {
private String tg014;
@ApiModelProperty("工单单号")
private String tg015;
@ApiModelProperty("批号")
private String batchNo;
@ApiModelProperty("标签明细")
private List<StorageDetailParams> storageDetails;
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/MoctgCreateParams.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.dto;
import com.topsunit.scanservice.ximai.common.Constants;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -54,7 +55,7 @@ public class MoctgCreateParams {
@ApiModelProperty("检验状态")
private String tg016="0";
@ApiModelProperty("批号")
private String tg017="********************";
private String tg017= Constants.BATCH_DEF;
@ApiModelProperty("急料")
private String tg024;
@ApiModelProperty("生产日期")
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/PurcdDto.java
View file @ 78fdbc62
......@@ -40,5 +40,7 @@ public class PurcdDto {
private BigDecimal cd018;
private BigDecimal cd019;
private String cd034;
@ApiModelProperty("批号")
private String udf07;
}
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/PurthCreateDto.java
View file @ 78fdbc62
......@@ -3,6 +3,7 @@ package com.topsunit.scanservice.ximai.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import java.math.BigDecimal;
/**
......@@ -53,4 +54,6 @@ public class PurthCreateDto {
@ApiModelProperty("")
private Boolean islot = false;
@ApiModelProperty("批号")
private String cd017;
}
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/StockAllocateParams.java
View file @ 78fdbc62
......@@ -25,6 +25,8 @@ public class StockAllocateParams {
String warehouse;
@ApiModelProperty("储位")
String location;
@ApiModelProperty("批号")
String batchNo;
@ApiModelProperty("调拨数量")
BigDecimal allocateQuantity;
@ApiModelProperty("调入仓库")
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/StockSaleOutParams.java
View file @ 78fdbc62
......@@ -35,5 +35,7 @@ public class StockSaleOutParams {
String warehouse;
@ApiModelProperty("储位")
String location;
@ApiModelProperty("批号")
String batchNo;
}
}
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/StockTakingParams.java
View file @ 78fdbc62
......@@ -25,6 +25,8 @@ public class StockTakingParams {
String warehouse;
@ApiModelProperty("储位")
String location;
@ApiModelProperty("批号")
String batchNo;
@ApiModelProperty("库存数量")
BigDecimal stockQuantity;
@ApiModelProperty("盘点数量")
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/StockTransactionParams.java
View file @ 78fdbc62
......@@ -19,6 +19,8 @@ public class StockTransactionParams {
String warehouse;
@ApiModelProperty("储位")
String location;
@ApiModelProperty("批号")
String batchNo;
@ApiModelProperty("操作数量")
BigDecimal quantity;
@ApiModelProperty("调入仓库")
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/entity/Purcd.java
View file @ 78fdbc62
......@@ -49,7 +49,7 @@ public class Purcd extends EntityBase {
private String cd015;
@ApiModelProperty("到货仓")
private String cd016;
@Column
@ApiModelProperty("批号")
private String cd017;
@Column
private BigDecimal cd018;
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/entity/Purtg.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.entity;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
......@@ -13,6 +15,7 @@ import java.math.BigDecimal;
* @version V1.0
* @date 2021/10/25
*/
@Data
@Entity
@IdClass(PurtgId.class)
public class Purtg extends EntityBase {
......@@ -101,668 +104,4 @@ public class Purtg extends EntityBase {
private BigDecimal udf60 = BigDecimal.ZERO;
private BigDecimal udf61 = BigDecimal.ZERO;
private BigDecimal udf62 = BigDecimal.ZERO;
public String getTg001() {
return tg001;
}
public void setTg001(String tg001) {
this.tg001 = tg001;
}
public String getTg002() {
return tg002;
}
public void setTg002(String tg002) {
this.tg002 = tg002;
}
public String getTg003() {
return tg003;
}
public void setTg003(String tg003) {
this.tg003 = tg003;
}
public String getTg004() {
return tg004;
}
public void setTg004(String tg004) {
this.tg004 = tg004;
}
public String getTg005() {
return tg005;
}
public void setTg005(String tg005) {
this.tg005 = tg005;
}
public String getTg006() {
return tg006;
}
public void setTg006(String tg006) {
this.tg006 = tg006;
}
public String getTg007() {
return tg007;
}
public void setTg007(String tg007) {
this.tg007 = tg007;
}
public BigDecimal getTg008() {
return tg008;
}
public void setTg008(BigDecimal tg008) {
this.tg008 = tg008;
}
public String getTg009() {
return tg009;
}
public void setTg009(String tg009) {
this.tg009 = tg009;
}
public String getTg010() {
return tg010;
}
public void setTg010(String tg010) {
this.tg010 = tg010;
}
public String getTg011() {
return tg011;
}
public void setTg011(String tg011) {
this.tg011 = tg011;
}
public Integer getTg012() {
return tg012;
}
public void setTg012(Integer tg012) {
this.tg012 = tg012;
}
public String getTg013() {
return tg013;
}
public void setTg013(String tg013) {
this.tg013 = tg013;
}
public String getTg014() {
return tg014;
}
public void setTg014(String tg014) {
this.tg014 = tg014;
}
public String getTg015() {
return tg015;
}
public void setTg015(String tg015) {
this.tg015 = tg015;
}
public String getTg016() {
return tg016;
}
public void setTg016(String tg016) {
this.tg016 = tg016;
}
public BigDecimal getTg017() {
return tg017;
}
public void setTg017(BigDecimal tg017) {
this.tg017 = tg017;
}
public BigDecimal getTg018() {
return tg018;
}
public void setTg018(BigDecimal tg018) {
this.tg018 = tg018;
}
public BigDecimal getTg019() {
return tg019;
}
public void setTg019(BigDecimal tg019) {
this.tg019 = tg019;
}
public BigDecimal getTg020() {
return tg020;
}
public void setTg020(BigDecimal tg020) {
this.tg020 = tg020;
}
public String getTg021() {
return tg021;
}
public void setTg021(String tg021) {
this.tg021 = tg021;
}
public String getTg022() {
return tg022;
}
public void setTg022(String tg022) {
this.tg022 = tg022;
}
public String getTg023() {
return tg023;
}
public void setTg023(String tg023) {
this.tg023 = tg023;
}
public String getTg024() {
return tg024;
}
public void setTg024(String tg024) {
this.tg024 = tg024;
}
public Integer getTg025() {
return tg025;
}
public void setTg025(Integer tg025) {
this.tg025 = tg025;
}
public BigDecimal getTg026() {
return tg026;
}
public void setTg026(BigDecimal tg026) {
this.tg026 = tg026;
}
public String getTg027() {
return tg027;
}
public void setTg027(String tg027) {
this.tg027 = tg027;
}
public BigDecimal getTg028() {
return tg028;
}
public void setTg028(BigDecimal tg028) {
this.tg028 = tg028;
}
public String getTg029() {
return tg029;
}
public void setTg029(String tg029) {
this.tg029 = tg029;
}
public BigDecimal getTg030() {
return tg030;
}
public void setTg030(BigDecimal tg030) {
this.tg030 = tg030;
}
public BigDecimal getTg031() {
return tg031;
}
public void setTg031(BigDecimal tg031) {
this.tg031 = tg031;
}
public BigDecimal getTg032() {
return tg032;
}
public void setTg032(BigDecimal tg032) {
this.tg032 = tg032;
}
public String getTg033() {
return tg033;
}
public void setTg033(String tg033) {
this.tg033 = tg033;
}
public String getTg034() {
return tg034;
}
public void setTg034(String tg034) {
this.tg034 = tg034;
}
public String getTg035() {
return tg035;
}
public void setTg035(String tg035) {
this.tg035 = tg035;
}
public String getTg036() {
return tg036;
}
public void setTg036(String tg036) {
this.tg036 = tg036;
}
public String getTg037() {
return tg037;
}
public void setTg037(String tg037) {
this.tg037 = tg037;
}
public BigDecimal getTg038() {
return tg038;
}
public void setTg038(BigDecimal tg038) {
this.tg038 = tg038;
}
public BigDecimal getTg039() {
return tg039;
}
public void setTg039(BigDecimal tg039) {
this.tg039 = tg039;
}
public BigDecimal getTg040() {
return tg040;
}
public void setTg040(BigDecimal tg040) {
this.tg040 = tg040;
}
public BigDecimal getTg041() {
return tg041;
}
public void setTg041(BigDecimal tg041) {
this.tg041 = tg041;
}
public String getTg042() {
return tg042;
}
public void setTg042(String tg042) {
this.tg042 = tg042;
}
public String getTg043() {
return tg043;
}
public void setTg043(String tg043) {
this.tg043 = tg043;
}
public String getTg044() {
return tg044;
}
public void setTg044(String tg044) {
this.tg044 = tg044;
}
public Integer getTg045() {
return tg045;
}
public void setTg045(Integer tg045) {
this.tg045 = tg045;
}
public Integer getTg046() {
return tg046;
}
public void setTg046(Integer tg046) {
this.tg046 = tg046;
}
public String getTg047() {
return tg047;
}
public void setTg047(String tg047) {
this.tg047 = tg047;
}
public String getTg048() {
return tg048;
}
public void setTg048(String tg048) {
this.tg048 = tg048;
}
public String getTg049() {
return tg049;
}
public void setTg049(String tg049) {
this.tg049 = tg049;
}
public String getTg050() {
return tg050;
}
public void setTg050(String tg050) {
this.tg050 = tg050;
}
public String getTg051() {
return tg051;
}
public void setTg051(String tg051) {
this.tg051 = tg051;
}
public String getTg052() {
return tg052;
}
public void setTg052(String tg052) {
this.tg052 = tg052;
}
public BigDecimal getTg053() {
return tg053;
}
public void setTg053(BigDecimal tg053) {
this.tg053 = tg053;
}
public BigDecimal getTg054() {
return tg054;
}
public void setTg054(BigDecimal tg054) {
this.tg054 = tg054;
}
public BigDecimal getTg055() {
return tg055;
}
public void setTg055(BigDecimal tg055) {
this.tg055 = tg055;
}
public String getTg056() {
return tg056;
}
public void setTg056(String tg056) {
this.tg056 = tg056;
}
public String getTg057() {
return tg057;
}
public void setTg057(String tg057) {
this.tg057 = tg057;
}
public String getTg058() {
return tg058;
}
public void setTg058(String tg058) {
this.tg058 = tg058;
}
public String getTg059() {
return tg059;
}
public void setTg059(String tg059) {
this.tg059 = tg059;
}
public String getUdf01() {
return udf01;
}
public void setUdf01(String udf01) {
this.udf01 = udf01;
}
public String getUdf02() {
return udf02;
}
public void setUdf02(String udf02) {
this.udf02 = udf02;
}
public String getUdf03() {
return udf03;
}
public void setUdf03(String udf03) {
this.udf03 = udf03;
}
public String getUdf04() {
return udf04;
}
public void setUdf04(String udf04) {
this.udf04 = udf04;
}
public String getUdf05() {
return udf05;
}
public void setUdf05(String udf05) {
this.udf05 = udf05;
}
public String getUdf06() {
return udf06;
}
public void setUdf06(String udf06) {
this.udf06 = udf06;
}
public BigDecimal getUdf51() {
return udf51;
}
public void setUdf51(BigDecimal udf51) {
this.udf51 = udf51;
}
public BigDecimal getUdf52() {
return udf52;
}
public void setUdf52(BigDecimal udf52) {
this.udf52 = udf52;
}
public BigDecimal getUdf53() {
return udf53;
}
public void setUdf53(BigDecimal udf53) {
this.udf53 = udf53;
}
public BigDecimal getUdf54() {
return udf54;
}
public void setUdf54(BigDecimal udf54) {
this.udf54 = udf54;
}
public BigDecimal getUdf55() {
return udf55;
}
public void setUdf55(BigDecimal udf55) {
this.udf55 = udf55;
}
public BigDecimal getUdf56() {
return udf56;
}
public void setUdf56(BigDecimal udf56) {
this.udf56 = udf56;
}
public String getUdf07() {
return udf07;
}
public void setUdf07(String udf07) {
this.udf07 = udf07;
}
public String getUdf08() {
return udf08;
}
public void setUdf08(String udf08) {
this.udf08 = udf08;
}
public String getUdf09() {
return udf09;
}
public void setUdf09(String udf09) {
this.udf09 = udf09;
}
public String getUdf10() {
return udf10;
}
public void setUdf10(String udf10) {
this.udf10 = udf10;
}
public String getUdf11() {
return udf11;
}
public void setUdf11(String udf11) {
this.udf11 = udf11;
}
public String getUdf12() {
return udf12;
}
public void setUdf12(String udf12) {
this.udf12 = udf12;
}
public BigDecimal getUdf57() {
return udf57;
}
public void setUdf57(BigDecimal udf57) {
this.udf57 = udf57;
}
public BigDecimal getUdf58() {
return udf58;
}
public void setUdf58(BigDecimal udf58) {
this.udf58 = udf58;
}
public BigDecimal getUdf59() {
return udf59;
}
public void setUdf59(BigDecimal udf59) {
this.udf59 = udf59;
}
public BigDecimal getUdf60() {
return udf60;
}
public void setUdf60(BigDecimal udf60) {
this.udf60 = udf60;
}
public BigDecimal getUdf61() {
return udf61;
}
public void setUdf61(BigDecimal udf61) {
this.udf61 = udf61;
}
public BigDecimal getUdf62() {
return udf62;
}
public void setUdf62(BigDecimal udf62) {
this.udf62 = udf62;
}
}
erp-system/src/main/java/com/topsunit/scanservice/ximai/entity/Purth.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
......@@ -14,6 +17,7 @@ import java.math.BigDecimal;
* @date 2021/10/25
*/
@Entity
@Data
@IdClass(PurthId.class)
public class Purth extends EntityBase {
@Id
......@@ -28,6 +32,7 @@ public class Purth extends EntityBase {
private BigDecimal th007 = BigDecimal.ZERO;
private String th008 = "";
private String th009 = "";
@ApiModelProperty("批号")
private String th010 = "";
private String th011 = "";
private String th012 = "";
......@@ -130,892 +135,4 @@ public class Purth extends EntityBase {
private BigDecimal udf60 = BigDecimal.ZERO;
private BigDecimal udf61 = BigDecimal.ZERO;
private BigDecimal udf62 = BigDecimal.ZERO;
public String getTh001() {
return th001;
}
public void setTh001(String th001) {
this.th001 = th001;
}
public String getTh002() {
return th002;
}
public void setTh002(String th002) {
this.th002 = th002;
}
public String getTh003() {
return th003;
}
public void setTh003(String th003) {
this.th003 = th003;
}
public String getTh004() {
return th004;
}
public void setTh004(String th004) {
this.th004 = th004;
}
public String getTh005() {
return th005;
}
public void setTh005(String th005) {
this.th005 = th005;
}
public String getTh006() {
return th006;
}
public void setTh006(String th006) {
this.th006 = th006;
}
public BigDecimal getTh007() {
return th007;
}
public void setTh007(BigDecimal th007) {
this.th007 = th007;
}
public String getTh008() {
return th008;
}
public void setTh008(String th008) {
this.th008 = th008;
}
public String getTh009() {
return th009;
}
public void setTh009(String th009) {
this.th009 = th009;
}
public String getTh010() {
return th010;
}
public void setTh010(String th010) {
this.th010 = th010;
}
public String getTh011() {
return th011;
}
public void setTh011(String th011) {
this.th011 = th011;
}
public String getTh012() {
return th012;
}
public void setTh012(String th012) {
this.th012 = th012;
}
public String getTh013() {
return th013;
}
public void setTh013(String th013) {
this.th013 = th013;
}
public String getTh014() {
return th014;
}
public void setTh014(String th014) {
this.th014 = th014;
}
public BigDecimal getTh015() {
return th015;
}
public void setTh015(BigDecimal th015) {
this.th015 = th015;
}
public BigDecimal getTh016() {
return th016;
}
public void setTh016(BigDecimal th016) {
this.th016 = th016;
}
public BigDecimal getTh017() {
return th017;
}
public void setTh017(BigDecimal th017) {
this.th017 = th017;
}
public BigDecimal getTh018() {
return th018;
}
public void setTh018(BigDecimal th018) {
this.th018 = th018;
}
public BigDecimal getTh019() {
return th019;
}
public void setTh019(BigDecimal th019) {
this.th019 = th019;
}
public BigDecimal getTh020() {
return th020;
}
public void setTh020(BigDecimal th020) {
this.th020 = th020;
}
public String getTh021() {
return th021;
}
public void setTh021(String th021) {
this.th021 = th021;
}
public String getTh022() {
return th022;
}
public void setTh022(String th022) {
this.th022 = th022;
}
public String getTh023() {
return th023;
}
public void setTh023(String th023) {
this.th023 = th023;
}
public BigDecimal getTh024() {
return th024;
}
public void setTh024(BigDecimal th024) {
this.th024 = th024;
}
public String getTh025() {
return th025;
}
public void setTh025(String th025) {
this.th025 = th025;
}
public String getTh026() {
return th026;
}
public void setTh026(String th026) {
this.th026 = th026;
}
public String getTh027() {
return th027;
}
public void setTh027(String th027) {
this.th027 = th027;
}
public String getTh028() {
return th028;
}
public void setTh028(String th028) {
this.th028 = th028;
}
public String getTh029() {
return th029;
}
public void setTh029(String th029) {
this.th029 = th029;
}
public String getTh030() {
return th030;
}
public void setTh030(String th030) {
this.th030 = th030;
}
public String getTh031() {
return th031;
}
public void setTh031(String th031) {
this.th031 = th031;
}
public String getTh032() {
return th032;
}
public void setTh032(String th032) {
this.th032 = th032;
}
public String getTh033() {
return th033;
}
public void setTh033(String th033) {
this.th033 = th033;
}
public BigDecimal getTh034() {
return th034;
}
public void setTh034(BigDecimal th034) {
this.th034 = th034;
}
public String getTh035() {
return th035;
}
public void setTh035(String th035) {
this.th035 = th035;
}
public String getTh036() {
return th036;
}
public void setTh036(String th036) {
this.th036 = th036;
}
public String getTh037() {
return th037;
}
public void setTh037(String th037) {
this.th037 = th037;
}
public String getTh038() {
return th038;
}
public void setTh038(String th038) {
this.th038 = th038;
}
public String getTh039() {
return th039;
}
public void setTh039(String th039) {
this.th039 = th039;
}
public String getTh040() {
return th040;
}
public void setTh040(String th040) {
this.th040 = th040;
}
public String getTh041() {
return th041;
}
public void setTh041(String th041) {
this.th041 = th041;
}
public String getTh042() {
return th042;
}
public void setTh042(String th042) {
this.th042 = th042;
}
public String getTh043() {
return th043;
}
public void setTh043(String th043) {
this.th043 = th043;
}
public String getTh044() {
return th044;
}
public void setTh044(String th044) {
this.th044 = th044;
}
public BigDecimal getTh045() {
return th045;
}
public void setTh045(BigDecimal th045) {
this.th045 = th045;
}
public BigDecimal getTh046() {
return th046;
}
public void setTh046(BigDecimal th046) {
this.th046 = th046;
}
public BigDecimal getTh047() {
return th047;
}
public void setTh047(BigDecimal th047) {
this.th047 = th047;
}
public BigDecimal getTh048() {
return th048;
}
public void setTh048(BigDecimal th048) {
this.th048 = th048;
}
public BigDecimal getTh049() {
return th049;
}
public void setTh049(BigDecimal th049) {
this.th049 = th049;
}
public BigDecimal getTh050() {
return th050;
}
public void setTh050(BigDecimal th050) {
this.th050 = th050;
}
public BigDecimal getTh051() {
return th051;
}
public void setTh051(BigDecimal th051) {
this.th051 = th051;
}
public BigDecimal getTh052() {
return th052;
}
public void setTh052(BigDecimal th052) {
this.th052 = th052;
}
public String getTh053() {
return th053;
}
public void setTh053(String th053) {
this.th053 = th053;
}
public BigDecimal getTh054() {
return th054;
}
public void setTh054(BigDecimal th054) {
this.th054 = th054;
}
public BigDecimal getTh055() {
return th055;
}
public void setTh055(BigDecimal th055) {
this.th055 = th055;
}
public String getTh056() {
return th056;
}
public void setTh056(String th056) {
this.th056 = th056;
}
public String getTh057() {
return th057;
}
public void setTh057(String th057) {
this.th057 = th057;
}
public BigDecimal getTh058() {
return th058;
}
public void setTh058(BigDecimal th058) {
this.th058 = th058;
}
public BigDecimal getTh059() {
return th059;
}
public void setTh059(BigDecimal th059) {
this.th059 = th059;
}
public BigDecimal getTh060() {
return th060;
}
public void setTh060(BigDecimal th060) {
this.th060 = th060;
}
public BigDecimal getTh061() {
return th061;
}
public void setTh061(BigDecimal th061) {
this.th061 = th061;
}
public BigDecimal getTh062() {
return th062;
}
public void setTh062(BigDecimal th062) {
this.th062 = th062;
}
public String getTh063() {
return th063;
}
public void setTh063(String th063) {
this.th063 = th063;
}
public String getTh064() {
return th064;
}
public void setTh064(String th064) {
this.th064 = th064;
}
public String getTh065() {
return th065;
}
public void setTh065(String th065) {
this.th065 = th065;
}
public String getTh066() {
return th066;
}
public void setTh066(String th066) {
this.th066 = th066;
}
public String getTh067() {
return th067;
}
public void setTh067(String th067) {
this.th067 = th067;
}
public BigDecimal getTh068() {
return th068;
}
public void setTh068(BigDecimal th068) {
this.th068 = th068;
}
public BigDecimal getTh069() {
return th069;
}
public void setTh069(BigDecimal th069) {
this.th069 = th069;
}
public String getTh070() {
return th070;
}
public void setTh070(String th070) {
this.th070 = th070;
}
public BigDecimal getTh071() {
return th071;
}
public void setTh071(BigDecimal th071) {
this.th071 = th071;
}
public String getTh072() {
return th072;
}
public void setTh072(String th072) {
this.th072 = th072;
}
public String getTh073() {
return th073;
}
public void setTh073(String th073) {
this.th073 = th073;
}
public String getTh074() {
return th074;
}
public void setTh074(String th074) {
this.th074 = th074;
}
public String getTh075() {
return th075;
}
public void setTh075(String th075) {
this.th075 = th075;
}
public String getTh076() {
return th076;
}
public void setTh076(String th076) {
this.th076 = th076;
}
public BigDecimal getTh077() {
return th077;
}
public void setTh077(BigDecimal th077) {
this.th077 = th077;
}
public BigDecimal getTh078() {
return th078;
}
public void setTh078(BigDecimal th078) {
this.th078 = th078;
}
public BigDecimal getTh079() {
return th079;
}
public void setTh079(BigDecimal th079) {
this.th079 = th079;
}
public String getTh080() {
return th080;
}
public void setTh080(String th080) {
this.th080 = th080;
}
public BigDecimal getThc01() {
return thc01;
}
public void setThc01(BigDecimal thc01) {
this.thc01 = thc01;
}
public String getThc02() {
return thc02;
}
public void setThc02(String thc02) {
this.thc02 = thc02;
}
public String getThc03() {
return thc03;
}
public void setThc03(String thc03) {
this.thc03 = thc03;
}
public String getThc04() {
return thc04;
}
public void setThc04(String thc04) {
this.thc04 = thc04;
}
public String getThc05() {
return thc05;
}
public void setThc05(String thc05) {
this.thc05 = thc05;
}
public String getThc06() {
return thc06;
}
public void setThc06(String thc06) {
this.thc06 = thc06;
}
public String getThc07() {
return thc07;
}
public void setThc07(String thc07) {
this.thc07 = thc07;
}
public String getUdf01() {
return udf01;
}
public void setUdf01(String udf01) {
this.udf01 = udf01;
}
public String getUdf02() {
return udf02;
}
public void setUdf02(String udf02) {
this.udf02 = udf02;
}
public String getUdf03() {
return udf03;
}
public void setUdf03(String udf03) {
this.udf03 = udf03;
}
public String getUdf04() {
return udf04;
}
public void setUdf04(String udf04) {
this.udf04 = udf04;
}
public String getUdf05() {
return udf05;
}
public void setUdf05(String udf05) {
this.udf05 = udf05;
}
public String getUdf06() {
return udf06;
}
public void setUdf06(String udf06) {
this.udf06 = udf06;
}
public BigDecimal getUdf51() {
return udf51;
}
public void setUdf51(BigDecimal udf51) {
this.udf51 = udf51;
}
public BigDecimal getUdf52() {
return udf52;
}
public void setUdf52(BigDecimal udf52) {
this.udf52 = udf52;
}
public BigDecimal getUdf53() {
return udf53;
}
public void setUdf53(BigDecimal udf53) {
this.udf53 = udf53;
}
public BigDecimal getUdf54() {
return udf54;
}
public void setUdf54(BigDecimal udf54) {
this.udf54 = udf54;
}
public BigDecimal getUdf55() {
return udf55;
}
public void setUdf55(BigDecimal udf55) {
this.udf55 = udf55;
}
public BigDecimal getUdf56() {
return udf56;
}
public void setUdf56(BigDecimal udf56) {
this.udf56 = udf56;
}
public String getUdf07() {
return udf07;
}
public void setUdf07(String udf07) {
this.udf07 = udf07;
}
public String getUdf08() {
return udf08;
}
public void setUdf08(String udf08) {
this.udf08 = udf08;
}
public String getUdf09() {
return udf09;
}
public void setUdf09(String udf09) {
this.udf09 = udf09;
}
public String getUdf10() {
return udf10;
}
public void setUdf10(String udf10) {
this.udf10 = udf10;
}
public String getUdf11() {
return udf11;
}
public void setUdf11(String udf11) {
this.udf11 = udf11;
}
public String getUdf12() {
return udf12;
}
public void setUdf12(String udf12) {
this.udf12 = udf12;
}
public BigDecimal getUdf57() {
return udf57;
}
public void setUdf57(BigDecimal udf57) {
this.udf57 = udf57;
}
public BigDecimal getUdf58() {
return udf58;
}
public void setUdf58(BigDecimal udf58) {
this.udf58 = udf58;
}
public BigDecimal getUdf59() {
return udf59;
}
public void setUdf59(BigDecimal udf59) {
this.udf59 = udf59;
}
public BigDecimal getUdf60() {
return udf60;
}
public void setUdf60(BigDecimal udf60) {
this.udf60 = udf60;
}
public BigDecimal getUdf61() {
return udf61;
}
public void setUdf61(BigDecimal udf61) {
this.udf61 = udf61;
}
public BigDecimal getUdf62() {
return udf62;
}
public void setUdf62(BigDecimal udf62) {
this.udf62 = udf62;
}
}
erp-system/src/main/java/com/topsunit/scanservice/ximai/service/CopthService.java
View file @ 78fdbc62
......@@ -93,6 +93,9 @@ public class CopthService {
copth.setTh014(copto.getTo004());
copth.setTh015(copto.getTo005());
copth.setTh016(copto.getTo006());
if(StringUtils.isNotBlank(s.getBatchNo())){
copth.setTh017(s.getBatchNo());
}
copth.setTh045(copto.getTo001());
copth.setTh046(copto.getTo002());
copth.setTh047(copto.getTo003());
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/service/InvmcService.java
View file @ 78fdbc62
......@@ -11,6 +11,7 @@ import com.topsunit.scanservice.ximai.entity.Invmb;
import com.topsunit.scanservice.ximai.entity.Invmc;
import com.topsunit.scanservice.ximai.entity.Invml;
import com.topsunit.scanservice.ximai.utils.MessageUtils;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -73,6 +74,7 @@ public class InvmcService {
return invmlMapper.toInvmlDto(list);
}
@ApiOperation("查询库存")
public List<InvmlDto> getInvmlList2(InvmlCriteria criteria) {
invmbDao.findById(criteria.getMl001()).orElseThrow(()->new TopsunitException(MessageUtils.getMessage("未找到物料：")+criteria.getMl001()));
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/service/InvtaService.java
View file @ 78fdbc62
......@@ -139,6 +139,7 @@ public class InvtaService {
invtb.setTb012(detail.getWarehouse());
invtb.setTb019(currDate);
invtb.setTb029(detail.getLocation());
invtb.setTb014(detail.getBatchNo());
//判断调拨库位是否与当前一致
if(StringUtils.isNotEmpty(detail.getAllocateWarehouse()) &&
StringUtils.isNotEmpty(detail.getAllocateLocation())){
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/service/MoctaService.java
View file @ 78fdbc62
......@@ -66,6 +66,11 @@ public class MoctaService {
});
}
public Optional<MoctaDto> get(MoctaIdCriteria criteria) {
return moctaDao.findById(moctaMapper.toMoctaId(criteria))
.map(moctaMapper::toMoctaDto);
}
public MoctaDocDto getForDoc2(MoctaIdCriteria criteria) {
MoctaDocDto dto = moctaDao.findById(moctaMapper.toMoctaId(criteria))
.map(moctaMapper::toMoctaDocDto).orElse(new MoctaDocDto());
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/service/MoctcService.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.service;
import com.topsunit.scanservice.ximai.common.Constants;
import com.topsunit.scanservice.ximai.common.DateUtil;
import com.topsunit.scanservice.ximai.common.StringUtil;
import com.topsunit.scanservice.ximai.common.TopsunitException;
......@@ -253,7 +254,7 @@ public class MoctcService {
// throw new TopsunitException(MessageUtils.getMessage("批管理品号{0}必须录入批号。", mocteCreateParams.getTb003()));
// }
// });
invmlDao.findFirstByMl001AndMl002AndMl003AndMl004(mocteCreateParams.getTb003(), mocteCreateParams.getTe008(), mocteCreateParams.getTe025(), "********************")
invmlDao.findFirstByMl001AndMl002AndMl003AndMl004(mocteCreateParams.getTb003(), mocteCreateParams.getTe008(), mocteCreateParams.getTe025(), Constants.BATCH_DEF)
.filter(i -> i.getMl005().compareTo(mocteCreateParams.getQuantity()) >= 0)
.orElseThrow(() -> new TopsunitException(MessageUtils.getMessage("品号{0}库存不足。", mocteCreateParams.getTb003().trim())));
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/service/MoctfService.java
View file @ 78fdbc62
......@@ -131,11 +131,13 @@ public class MoctfService {
moctg.setTg007(invmb.getMb004());
moctg.setTg013(create.getTg011());
moctg.setTg037(invmb.getMb004());
moctg.setTg010(invmb.getMb017());
moctg.setTg010(create.getTg010());
moctg.setTg017(create.getBatchNo());
if(StringUtils.isBlank(create.getBatchNo())){
throw new TopsunitException(MessageUtils.getMessage("批管理品号{0}必须录入批号。", moctg.getTg005()));
}
ta083.set(mocta.getTa083());
//查询物料默认仓库
Invmc invmc = invmcDao.findById(new InvmcId(invmb.getMb001(), invmb.getMb017())).orElseThrow(()->new TopsunitException(MessageUtils.getMessage("未找到对应物料默认库：{0},{1}", invmb.getMb001(), invmb.getMb017())));
moctg.setTg036(invmc.getMc015());
moctg.setTg036(create.getTg036());
moctg.setTg030(currStr);
moctg.setTg038(moctg.getTg011());
moctgDao.save(moctg);
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/service/PurccService.java
View file @ 78fdbc62
......@@ -12,12 +12,14 @@ import com.topsunit.scanservice.ximai.security.CurrentActor;
import com.topsunit.scanservice.ximai.utils.MessageUtils;
import com.topsunit.scanservice.ximai.webapi.PrintApi;
import com.topsunit.scanservice.ximai.webapi.dto.PrintField;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
......@@ -183,6 +185,7 @@ public class PurccService {
objectMap.add(PrintField.of("CD006", j.getCd006().trim()));
objectMap.add(PrintField.of("UDF01", j.getUdf01().trim()));
objectMap.add(PrintField.of("UDF02", j.getUdf02().trim()));
objectMap.add(PrintField.of("CD017", j.getCd017().trim()));//批号
objectMap.add(PrintField.of("CC010", optionalPurcc
.map(Purcc::getCc010)
.map(DateUtil::stringToLocalDate)
......@@ -224,6 +227,7 @@ public class PurccService {
return byMc001.stream().findFirst();
}
@ApiOperation("")
@Transactional
public void create(StockArrivalParams stockArrivalParams){
if(CollectionUtil.isEmpty(stockArrivalParams.getDetails())){
......@@ -271,6 +275,12 @@ public class PurccService {
purcd.setCd013(detail.getArrivalQuantity());
purcd.setCd015(purtd.getTd009());
purcd.setCd016(purtd.getTd007());
//按批管理
if("Y".equalsIgnoreCase(invmb.getMb022())){
purcd.setCd017(buildBatch(detail));//生成到货批次号
}else{
purcd.setCd017(Constants.BATCH_DEF);//生成到货批次号
}
purcd.setCd021(invmb.getMb004());
purcdDao.save(purcd);
sumQuantity = sumQuantity.add(detail.getArrivalQuantity());
......@@ -299,4 +309,11 @@ public class PurccService {
})
.orElse(prefix + "001");
}
//生成批次号：产品+客户+日期yyyyMMdd
private String buildBatch(StockArrivalParams.StockArrivalDetail detail){
String rst = detail.getMaterialNo()+detail.getSupplierNo();
rst+= cn.hutool.core.date.DateUtil.format(LocalDateTime.now(), "yyyyMMdd");
return rst;
}
}
erp-system/src/main/java/com/topsunit/scanservice/ximai/service/PurtgService.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.service;
import com.topsunit.scanservice.ximai.common.DateUtil;
import com.topsunit.scanservice.ximai.common.OrdinalHelper;
import com.topsunit.scanservice.ximai.common.StringUtil;
import com.topsunit.scanservice.ximai.common.TopsunitException;
import com.topsunit.scanservice.ximai.common.*;
import com.topsunit.scanservice.ximai.dao.*;
import com.topsunit.scanservice.ximai.dto.PurtgCreateCriteria;
import com.topsunit.scanservice.ximai.dto.PurtgCreateDto;
......@@ -217,7 +214,11 @@ public class PurtgService {
purth.setTh007(localPurcd.getCd018()); // 进货数量
purth.setTh008(localPurcd.getCd007()); // 单位
purth.setTh009(purthCreateParams.getTh009()); // 仓库
purth.setTh010("********************"); // 批号
if(StringUtil.isNullOrEmpty(localPurcd.getCd017())){
purth.setTh010(Constants.BATCH_DEF); // 批号
}else{
purth.setTh010(localPurcd.getCd017());
}
purth.setTh011(localPurcd.getCd010()); // 采购单别
purth.setTh012(localPurcd.getCd011()); // 采购单号
purth.setTh013(localPurcd.getCd012()); // 采购序号
......
erp-system/src/main/java/com/topsunit/scanservice/ximai/service/SfctbService.java
View file @ 78fdbc62
package com.topsunit.scanservice.ximai.service;
import com.topsunit.scanservice.ximai.common.Constants;
import com.topsunit.scanservice.ximai.common.DateUtil;
import com.topsunit.scanservice.ximai.common.TopsunitException;
import com.topsunit.scanservice.ximai.dao.*;
......@@ -145,7 +146,7 @@ public class SfctbService {
// tc029
// tc030
// tc031
sfctc.setTc032("********************"); // 批号
sfctc.setTc032(Constants.BATCH_DEF); // 批号
// tc033
// tc034
sfctc.setTc035("N"); // 急料
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment