From 22c7963bf59f35cb7ad3e7d008d3479aa9dd7a0e Mon Sep 17 00:00:00 2001 From: zc Date: Wed, 10 Jun 2026 10:37:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/entity/FullWorkOrderDO.java | 5 +++++ .../model/query/FullWorkOrderQuery.java | 6 ++++++ .../model/req/FullWorkOrderReq.java | 8 ++++++++ .../model/resp/FullWorkOrderResp.java | 6 ++++++ .../impl/FullWorkOrderServiceImpl.java | 4 ++++ .../material/model/entity/MaterialInfoDO.java | 5 +++++ .../model/query/MaterialInfoQuery.java | 7 +++++++ .../model/req/MaterialImportRowReq.java | 10 +++++++++- .../material/model/req/MaterialInfoReq.java | 9 ++++++++- .../material/model/resp/MaterialInfoResp.java | 7 +++++++ .../service/impl/MaterialInfoServiceImpl.java | 2 ++ .../weighManage/model/entity/WorkOrderDO.java | 5 +++++ .../model/query/WorkOrderQuery.java | 6 ++++++ .../weighManage/model/req/WorkOrderReq.java | 7 +++++++ .../weighManage/model/resp/WorkOrderResp.java | 7 +++++++ .../service/impl/WorkOrderServiceImpl.java | 1 + .../resources/mapper/MeterialInfoMapper.xml | 16 ++++++++++++++++ .../templates/import/materialInfo.xlsx | Bin 9445 -> 9507 bytes 18 files changed, 109 insertions(+), 2 deletions(-) diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderDO.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderDO.java index cbe3313..d2bda57 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/entity/FullWorkOrderDO.java @@ -36,6 +36,11 @@ public class FullWorkOrderDO extends BaseDO { */ private String materialCode; + /** + * 打印物料编码 + */ + private String encodingPrint; + /** * 图片地址 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java index 4b4b713..93360b7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/query/FullWorkOrderQuery.java @@ -37,6 +37,12 @@ public class FullWorkOrderQuery implements Serializable { @Schema(description = "物料编码") private String materialCode; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码（国产替代）") + private String encodingPrint; + /** * 物料名称 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java index dde32bc..a5db1e0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/req/FullWorkOrderReq.java @@ -45,6 +45,14 @@ public class FullWorkOrderReq implements Serializable { @Length(max = 255, message = "物料编码长度不能超过 {max} 个字符") private String materialCode; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码（国产替代）") + @NotBlank(message = "打印编码（国产替代）不能为空") + private String encodingPrint; + + /** /** * 图片地址 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/resp/FullWorkOrderResp.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/resp/FullWorkOrderResp.java index dd13c84..2f9c022 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/resp/FullWorkOrderResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/model/resp/FullWorkOrderResp.java @@ -44,6 +44,12 @@ public class FullWorkOrderResp extends BaseDetailResp { @ExcelProperty(value = "物料编码", order = 4) private String materialCode; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码（国产替代）") + private String encodingPrint; + /** * 物料名称 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java index b7cadbf..82fe016 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java @@ -26,6 +26,8 @@ import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderInfoReq; import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderReq; import top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp; import top.wms.admin.fullWorkOrder.service.FullWorkOrderService; +import top.wms.admin.material.mapper.MaterialInfoMapper; +import top.wms.admin.material.model.entity.MaterialInfoDO; import java.util.Date; import java.util.List; @@ -42,6 +44,8 @@ public class FullWorkOrderServiceImpl extends BaseServiceImpl page(FullWorkOrderQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java index f599b53..f16d7fe 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java @@ -32,6 +32,11 @@ public class MaterialInfoDO extends BaseDO { */ private String encoding; + /** + * 打印物料编码 + */ + private String encodingPrint; + /** * 物料单位重量(g) */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java b/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java index b5b696f..e70e410 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/query/MaterialInfoQuery.java @@ -37,6 +37,13 @@ public class MaterialInfoQuery implements Serializable { @Query(type = QueryType.EQ) private String encoding; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码（国产替代）") + @Query(type = QueryType.EQ) + private String encodingPrint; + /** * 批次 */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java index 1788c7f..9347f62 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java @@ -29,9 +29,17 @@ public class MaterialImportRowReq implements Serializable { */ @Schema(description = "物料编码") @NotBlank(message = "物料编码不能为空") - @Length(max = 255, message = "物料编码长度不能超过 {max} 个字符") + @Length(max = 64, message = "物料编码长度不能超过 {max} 个字符") private String encoding; + /** + * 打印编码（国产替代） + */ + @Schema(description = "打印编码（国产替代）") + @NotBlank(message = "打印编码（国产替代）不能为空") + @Length(max = 64, message = "打印编码（国产替代）长度不能超过 {max} 个字符") + private String encodingPrint; + /** * 物料单位重量(g) */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java index 8ac95f6..e04c3ad 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java @@ -37,9 +37,16 @@ public class MaterialInfoReq implements Serializable { */ @Schema(description = "物料编码") @NotBlank(message = "物料编码不能为空") - @Length(max = 255, message = "物料编码长度不能超过 {max} 个字符") + @Length(max = 64, message = "物料编码长度不能超过 {max} 个字符") private String encoding; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码（国产替代）") + @Length(max = 64, message = "打印编码（国产替代）长度不能超过 {max} 个字符") + private String encodingPrint; + /** * 物料单位重量(g) */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java index b2f9f90..db255e7 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java @@ -36,6 +36,13 @@ public class MaterialInfoResp extends BaseDetailResp { @ExcelProperty(value = "物料编码", order = 2) private String encoding; + /** + * 打印物料编码 + */ + @Schema(description = "打印编码（国产替代）") + @ExcelProperty(value = "打印编码（国产替代）", order = 2) + private String encodingPrint; + /** * 物料单位重量(g) */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java index c777ac7..99564ce 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java @@ -254,10 +254,12 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl ELSE unit_weight END, + encoding_print = CASE + + + WHEN material_name = #{item.materialName} THEN #{item.encodingPrint} + + + ELSE encoding_print + END, update_user = CASE @@ -60,6 +68,14 @@ ELSE unit_weight END, + encoding_print = CASE + + + WHEN encoding = #{item.encoding} THEN #{item.encodingPrint} + + + ELSE encoding_print + END, update_user = CASE diff --git a/wms-webapi/src/main/resources/templates/import/materialInfo.xlsx b/wms-webapi/src/main/resources/templates/import/materialInfo.xlsx index 203a52018df77f51881c1e486094d8a57daa4397..d08b436132b83aee6aa790972504697ba0ca7c36 100644 GIT binary patch delta 2526 zcmV<42_g37Nux@z$_4~DYgYP`&IT!eVv~d{{qrEf~jS!yzW&TWzV z0U@DZFd=b+5b5_|sKr7ge4>)7;L{eUpjOv}i^09=L+(RaJV4DoTKui(J@k z4T@2bMAM~In$2^Ny`ep{(Qt?GPy$WRt^}c@r3#T~Wz@o+0JPtbKGIK#Pw7DlHpe-5 zA5z!X{86|X?pf*ZgRH_mR`>#cM#-nqC|IlZN(9OKAX;zFEx@DGg~<6`V_n3`@)s*y zrE-jNX6*M=Sf0kX4@0%)2NSv~zf~fKXorv>#Qtb+=PQj;zF<{uZ@|bcJnW1x90oo2 zB^cv8w_HnR`B+H{KHTa0tmkU%ai+lG=r{jc3C&?+fxkd2v@D6(+*~n#o1seQF&;;= zTLbcEe_*q2XA^E#R+Y0?zGTOn;6I$n5+~OOy$z@4{jGMOrlZz7i0GSLxzc%s98XEGf3y>YMG_qv_n+#5`2-|Jj-#vKw2dt^L#1~EE} z62&T;?Mm&SW88(h9)&J{*`|$95>+C7q47j^m*@I7O&fc5g59BZC-~aDn8FRw=3dBD ztz+y_0*h}ChwD0cFH)PuI3NSZubKP7#WDlNH0ToQNC%Etj1L%18b%jzd9FEN?0a#fcEo&#(R-pbgZ+zdh=2 z|D*ZrKw*Z}s2onx7<~?=y9jynnXaFolw3ut??}A=MlzB}0zLxdsPf!1_N<6IfP7FC znxGVMBI$)JNS4KD0l|rXwGZfm1F!MW?$_Sdx}g8&&Vi)(oPWuG*mXzBoT?=Sm4shn1o^zugFFEO-Q+AJ%YRisWo8T@9Blw?We`TLKc0+-gU8Wb%VA{+ zZEXqO@3;av?F!n;U=Y5~Ra99*TaW5~Y>$-zw6(#bJBSA1I0)}s!Um*+gtl?zhS6j+ z_><+NvV^v_gnw>7AD)>qJ?%>@@qEVF)q&***%KvJn_DmiOEt$Z7mY?U?@(Kb;(t~K z+6u7e+Ki12Yz<%zwf0hj+HHkfZ(a)R1Ze{c8(7-F$_Cap zu(5${3otn~=dam_%M;u>B~9SGO<5t;Nv?K)*AlK|1zWJ9y1J^uE%A|j#r#MM;bbI* zrRTeF+;DR^>%L^AMjH!5^R7nW?8)uzXy-9hx>e6%EKLNEl~25@RvCQWP!rVzSNA+6-ve$ z19<5GL3+MYsWi$gXX#jzANE#RN3PUGOVdhjQNZwc zot9l3W*V|_^Sry2d}xWYs`&K%yc=HRd(^5I9<=JA&{BuLMR+IyP7i1Xy~CtgO*-3G zFYh)o{L7ou)Qqal@Z$cD(kFc&ZvGOd8+W(dgeUpDKL~$5zIA6cfqcP(+Hus_ytj=f zhS27-sw&y0^@uy!gPT#fBkD(^wwzk7+3TOQqvlz^^JP-@%*;^!aLhlG@f;Nee0D}~ zT(b)uGyww5xsyR2Lw|RS9Br5sEGr~LXbT!myjKKyVBh zHE$vRbxP7+Zt=PFYI_->AReyQapowAg`}kpgecP<+ zrn0^j2NZ{bQ?7uSLd9ox+ch|go2wA_%Jm5|rp?@5dzpeb-^QOGug=%odx(Ea7TDx( zsURGih_?Cn%KhNtGMS+`Ai>Bb12-TE8PTCnPfj1}$p`&)!nTm_=Ko8y&`CnZbU2|w z&?D{vag+P-R|3S}lkprCvzi}20|Yp0R{E3OB7q9ntT(Wb0{{Ro3zKLgRsnXCzau~b z1s9V6Bp)2l)3k8!0RRB61^@sQ00000000000000002UjQ4;vPf)gurbe0D}~Tmb+8 oVgdjF5dZ)H0000000000001`~lYS&U0m_rSBqIimA^-pY0BCB;bpQYW delta 2453 zcmV;G32OGEO65tg$_4~dr9u^x&IT!ef@#81R8lpe)goNMI z_gzCso93l!5!l!lj?cOG*r#XfQlLks4OcS3ID}1N|iM3E4}*`Y;FY zL+bgOJ#tsW9V;DukX5w9ieA8fNbqSi0@iB05<~Jnh}Pe63-R!D&IP+`t&3z8*dal797YZDXezU(d*9IW z2UI=ZZr2GUoE$&MOvmKm={!B@56F4nJC4GU*Nb{1Z`3=!@CX^C!ME{cnnvUq#ONr_ z6s>KsEwzJAa1ZKw5c)}f*Ik4Jan17=8c)IY@?8I>>0-}LushW5I9r()Q@9~o-*cI( zRf0Vdz~Yt9Muq5<7N!C{T1g(=uffkwlfG?F2>t zy+cxxB`R=(1db>@zIiho4ww1ubDlXT!UbhTi~`q34k;40qs2Z(KfbSTCdd&I7dxD> zg2d>B2z0yn_+fr#{7D=Lkq#&nB1Q)(%bDki$j+f_K^| z&%Dt0M_!I;fsDe8zeR(kDNV?VCC8i;(ui=9VF~ez11&|ZmM3qK%Q1gCmNyB@OOV*o zjLH`+ikv)|ecBg{<821xehvmWah^H+LimqrHyZDG%4x!xV5xLL*)uWshd=eE9!?si z{`lV{6AU~~PE<|cMSm)MUr52Q(F!kO(L2RPjhIRopB?EgMt}V3?*`gHJ^ag~?)!@t z^Bsj5R-;u%pOO`Tg-L+{G{Y8TJMg;+ixTzi6r17K#nTUEn`oL_z55%6on=z zMVv@_B1@8GF?xWJir?A?yn+L-@z8#+y{&aYf8oxKr1+T0uYc_PNa+3`!RKdBh^ zeMZn_Ec=YG%UBr(WU28o>@pr+@nX4I_bE|VWYcF1x{SwH++1SyAZbnJ)XK0kH*`l$ z;#7Z(pirA3O{~Nj22^Ilm|BVJGXg97D?@>rYeWKTOn-U}>owL;MqNMazMrv`xjw_v zcr*-nUIMwKzmqx0NiTB)cX+8eMNk2&4MP>-y$vjFU}XTk2WpcCo3XZmO$+FR2NQBV zJVoe)X9G(cSQ(%dp3PX>z@`Os!h=O}weD1ZCpsHg+Q7;Ht>|pV+6FcTi1d-rUKLP? zt?24aL}{U&m~3Ea11lSNuz|G=Y+8WHm^rM>epepgiY93Shf~T5sg6ChHeX7(zZ7iA zit3)HMpWWG`HcCV7Q)F$3I*-Eus3salIeHJN{vDuwoJltRev4e7Du3FeHY|Y#$^4W z4$tOZxcCQ?kpmR7gb$z#39bmi(9;0`09BJM8yu;`f6qbYNAc%i1_B!i4OUff`bKVD8M#Wr4hiM2z(UY1{ zHp6I7V~8GXz)$v9C=|Mxe3pKT7Yv15y1fyjp#^<@#~rpPTLA^!=?ntO?`|ZdXoP zwY68}Ef{wIlaT`y1t753lU=h)9W(&~{n3+v9z%ck6gk>3 zDOgrWh|m@^n#RXRAulN}6f9Ixf-)&+$C9L`yo}J=n37_w`5JPjJ?oHGTox*4#y-^w zmyAEL72tr7G0wp-!3@JS&@DS6+93t+kma+=8i3#!GRQ$1jeXC@KVAbW*MBxNO3#_6 zW?R~wc5(Y`!CSF&Z*$1HW6*}@0I((#bq)>aX^Bx zO9pO05;CSkpN>u*>&XZGb;7og@8