From 340355a66b98ccb4335660cec49805fae9c21187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Thu, 23 Apr 2026 17:00:10 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=8D=B0=E5=B0=BC=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E=E5=AD=90=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../md/dao/MdCsCustomerBase.java | 5 +++++ .../master/service/dto/CustomerbaseDto.java | 5 +++++ .../org/nl/wms/basedata/master/wql/mdcs.xls | Bin 159232 -> 159232 bytes .../pda/st/service/impl/PrintServiceImpl.java | 10 +++++++++- .../src/main/resources/language/i18n/en.js | 1 + .../src/main/resources/language/i18n/id.js | 1 + .../src/main/resources/language/i18n/zh.js | 1 + .../wms/basedata/master/customer/index.vue | 11 +++++++++++ 8 files changed, 33 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/dao/MdCsCustomerBase.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/dao/MdCsCustomerBase.java index 6ece4af..cae138e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/dao/MdCsCustomerBase.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/dao/MdCsCustomerBase.java @@ -212,4 +212,9 @@ public class MdCsCustomerBase implements Serializable { * 内标打印模版 */ private String bz_print_within; + + /** + * 是否单卷单箱 + */ + private String is_single_roll_single_box; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java index eef63eb..7fc3438 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java @@ -209,4 +209,9 @@ public class CustomerbaseDto implements Serializable { * 内标打印模版 */ private String bz_print_within; + + /** + * 是否单卷单箱 + */ + private String is_single_roll_single_box; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls index 3e4a97026ce81af1ea7a2458d78db99cb569fddd..66203975896a85cd4da58df5814ea15f10f63914 100644 GIT binary patch delta 13963 zcmeHOd3aP+mOrnuPzewMAyj2wAqixIB#?z73A+#=At4JANJ0Rk5op{1feI*SR7AP9 zLB&?T?jGCe(Z(*nVdfhb*SZfBKL4W2mp{ zy?frhzu)hkd*8WR=s6bAb1dS(^`XPoc<=k_&0|^!0Q87Wp#!e+zXUdiC5MDQw)E9N zV845h7C8lqpp3twI-Z`@GKtU(+=>By1pP)@`#J6ZDMEAgJOR2c+r~X#b-AsZxtCSqr~pCNa0V*73Y!* z#jn%Gi;@(tcqh#(7Np!KzDz6B5ItoM{*Fs6z~9EyTg0r)QGtT=e+Y{n!-CRL5TxR5 zs(3Z)Wz8d=$@Yk+v%TVj?Cj8AzBars5Rvm$lxUe69d-@oa*6x$Vntrr5Rp(3t#ygB z6DMfb^6zz`Ha|f;GCq1pH|7h22vO&Y5s#KGX4~}^TZf1$-z+wjMQiK#mKBTsvS{&2 zdAwL&HdMa7TQ*a>!FbYCp+DK3J4)PX-fK6D!pcfsCYxkuZi z?l$vX_cV`otH`aGplwl4wyG!FSiGNqd$kuoD3w1U;+ z8kW@GQop4B*<0g4>w+6#1%A6=Ev&&#y$VwsU>)9d53+ZleWQ5twwYm5;iyX!pWik! zP<;D?F3+zabt%9wq(6s^ec!%5xY_sM|ln7d{ z9U<8PA;ke9RU*{&#>85&@%<#lfla-0H0`)};jW^z6F`o*2$7J0;pao3Chmt(mqxkht^LlWnr97!ri7w2%x94RVCipudj&JiJVq^TTfD#yrsuC|HI#M~%W zY`@3uh;jN8i+i)!X02|vM0f)ctc^e30bzoJEmtC>?T(4HBIL^_SM5$f??hsXypy47 zmZ564eK+}!BR1w3t8$E0Io{bl#eaf(H(_L{99c#V93$xC#+LB{)#@Yom_H}M_~_4a z@R?yTulh5p^PewMZi4?Z1xXM&;UssFTpV;x0lf?T7$R~}=qEv+lTu)w1?waD6i(yE z%?={Bos@TkML7A0Gu#3c@a)OgTf3f3^=7+``mfzaEw5~T8E>eul~LL#c-d{_NxLn|!G=M2P`+ri4Y5~b zq;3>-`|UlRf|Wfx1uMHPRw6vHKPJcOC67aHuWk$6EL`E?+aANz&j+>HbH1-F-lhm+ zXQcpbw^8e%O|(B^uM4%8JvX(N-A3(22+s~epa!z%rUtUxsDTJU8{|)F5_@i^Ci%Oz zh%Jg;p+zhn$9W>x;_E@RpaIBU3mSmzwj_yA{ir<-(g1|H16_|M4715ga{!_d$PS(% z!C!dF-sQ$R%z?t^| zUil2*wy#vTc`9(j?@~2C%_i)-)c#x{zsQ3{eUg)elbhy7KJZXTXJn->o089vuySLXLV5! zBQDOixgv2Q46qWvsZ}&pkHC3YH(-b5Sy=?mpSs08j^(JKsa!gji^Ou*!xyq#B$eCy zl2uyGOV$b zRgc9gti$!KkqUwJv@61HiN$5#PhdNyXc8NXy9gVkJsj_-yXp2JxHu)J#^Mxp9qzx- znxQRbE!!7bN3bu*o{usM*Erd(fF|1(-rU-8g&e_*9-WcTH2n~{FjN%`I zD=wYCACfUY@vn2@61j(|u5QWWVV(%d<54^wu4k#_@hBdT;vrog=An9exSo-SL-q7r zzMk0ayyC^fBmJ9TsMO#^4Vz$?N`=5?+QxK;Vvi#j&3AH1kzGx}5aj~8`pk#;xc z7%p{qFRw#1yc)Z56GTbYIMy%%Q&g`w^uuPxi?jGUPVvVne)4x5^KWwW_u*ILu&&XP zC!TpmN}hP+*~&ce%wzaFUh%|Rc;YY5gKKAcr7337t65&9uf8=5GozX%IW5M!AV!kY zV*ENLPeAf6++@=$pMd1sq&*ySkdyndOC=z=A9^4tj)>=9i}QEEXo;W5_^}c{QQ;>t zKFzVnxrqut5i55czceH^5%JH!7=`6VE)S+?TObh|GKg2kFABUXDI!nh+9qKj+74a` zKzj;ZV*TqamPqmT>()@a>`2_zJ0MAxp6uu%?Y zwCq&u`K`&X-zzIPqF4; z8+BVddYOZ*+`(26WHY7*Q-f`j<($D6Y?QWX7TZ!5Q>oj;uD4QF^g@d4R;k#ndLdP% zLf|eH;8L+`^{N1uitmQrwNkljc@d8SOe%M+Ubq|X!RP!Dp>L;My$jMLDs6x5f^n(B`4Ww`1ohsM#ojO?b(Zo*7U7GUqX}`lWK537EyV~3ZqJ^hq_G8d)ccsCsRPAs^6}Y9dX|S(>Vy*M<2>~7DwwQN{t#G=Qvw|(j~%@oQ`9x{ z(9xX?pNEaSnum9qKIEaF*Wi=E!#Ir(L=4=x`AFOcQzR8_meGHNQj$-6tIwTDWrgf&`|&h z@fR3Mpn!#}#bWfJKnW>OLa6oyEM%DjDUEtW8qK7IO!_gVsSyg9bgCpRRGft(|4$?9 z^a>YRcnUAeGg0!4W}b=6^JmF3k$FyueSgYG(orV{p(evb168ygi_4fKk-UsFiIIHL zO_LbuQ!)COfi%g2G${xvZA~I06fweSsilY!&R~lCS)}S*WNGjs<>w-WPaZ2``~p{A$N zrnvohhF@>RDM3hMV2XjHy8SXak)}Bmp=L8`DeE&9^rehCOZLH1)gGmm_9#`}D(w_k}ZyA!_kBer#bCe>#F97#JtlPyt>q@8%$t%H}VnwDEg%T-OwgS?vz<-rvd z2TsIl6=K<7(#Mm2yz{{bS;ggYaY{30az2ePMUgO#y+2oae;W6*WB8anHVtcOjxf`>uWc7c zK1yh(cXArm#Xgpp{-nW-CgMb;k13VRbd_YPBt%I%3 z!M2!fLCaJ>y1(8bBW;%1J+maJaF4c(-A`)_`*v@WL)m5rTMOF!b`n|?*=@@lY^@Hq z;J^J{6x`5rJMGLeM7~Ga12{Xv}1UGh+3pC3BKt=HU9<>O-#`Vd)cy zS%_usmd|3W&&B(nR+a>NL?3kU<>Zq3q+vFeH22GAbIC8o!qXnDQLH|lwP0|0dXI@& zpFYgtT6~3R^1~b~-wA)g6t(dj)y8vV8^3=#%Rv!E0YcQL5px;wtVEp4h+m7zXPoLn zv4TqKQ-!OzgUtGMJj@sExrDWXtGeY~H?CBKm+=W)qzMe=8r4)v$FLnZY=dp?)^ zPL`a{CBMfM)qlRK|9lzDpZP4oPZRL@4(+SA4n;6R&#xkX)-d`H61|4e|3{^0P>NG2 zT7hiG6fxJ}(5o+dYSgqqw+~q;N0AyFay#KX7N8|ajdc`}Gck&sB&LwXEMPG|Vw$8a zU@;fO-p`$!MDdkMPUMmcx#UGzav_(zgej7=P&sL#bW-vcS^mM@j-oRmPGZDGj5r_> z7cnB57;%w8T%>n9$+Sp0Ws!0UHO8XBjp3ILpzu$mMNC?Y4CcX1Es~lCGqp%+9?aAt zv3W34i^Ln)X|+gf9?aAtv3@X9%Lf+5!AvdqFMBeBQI^IZ5>?Ei>R6OyOum@OjpLieOl};9q@k#R6sgU*1{UOax+5pHG@T&wQYK%* zKbYr0O^!jcS&FG(G0iB(JO*lJF>x|bHKUl-jN6Q2I&mLWe?ywVZ-nn=RHN@&5q&d? zS)&f6@Q(_xkZ~y0>?nq&g5;U0ET#p;bON1X5Lye0>4XF+rbUTqflxm_pknj}w4iJB zv808?(7IN)8w(QrO9sqQgFrNtv^WZ(=_eujSjbWoVjgrYMIq)v*HRSHs&4=N3~3t*Faft(G-zt7VPb ziZ6hXm16x9) zD)s*f1^WMp>boIS+hDUDJQu2c9q*i_9gOL8F=sivG7p5uE#5-(Tso14*2R<9}KK=?bOE7(`fw8z&O;6 z{p=?EZO7ST7f#^T;#`l?tNKdTxE>l(f`8O88A|%zS>t+A3lnLfF$a6DaaCy#j@Lr} c`C8Wnt*>V`*0e2FbBpyqOgiZ5cJ*uj3xc(J&Hw-a delta 13727 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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java index 89fdb13..8c42ea5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java @@ -96,6 +96,8 @@ public class PrintServiceImpl implements PrintService { String nspector = "1"; //储存条件 String storage_conditions = ""; + //子卷号 + String container_name = ""; // 根据客户条件选择对应模板 JSONObject jsonCust = custTab.query("cust_code = '" + box_jo.getString("customer_name") + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); @@ -107,12 +109,17 @@ public class PrintServiceImpl implements PrintService { throw new BadRequestException("请先设置客户打印模板"); } String bz_print_no = jsonCust.getString("bz_print_no"); + String is_single_roll_single_box = jsonCust.getString("is_single_roll_single_box"); double weight = 0; JSONArray rows = WQL.getWO("PDA_ST_01").addParam("flag", "5").addParam("box_no", box_no).process().getResultJSONArray(0); for (int i = 0; i < rows.size(); i++) { JSONObject row = rows.getJSONObject(i); weight += row.getDoubleValue("net_weight"); + + if(i == 0 && "1".equals(is_single_roll_single_box) ){ + container_name = row.getString("container_name"); + } } // 生成txt文件 @@ -132,7 +139,7 @@ public class PrintServiceImpl implements PrintService { fw = new FileWriter(filePath); OutputStreamWriter write = new OutputStreamWriter(new FileOutputStream(file), "utf-8"); BufferedWriter bw = new BufferedWriter(write); - bw.write("bz_print_no,package_box_sn1,package_box_sn2,sale_order_name,product_description,product_name,width,pcsn,date_of_FG_inbound,box_weight,date_of_production,quanlity_in_box,quality_guaran_period,nspector,storage_conditions,weight,customer_name,customer_description,thickness,mass_per_unit_area,length,box_type,sap_pcsn,box_length,box_width,box_high,material_type,joint_type\n"); + bw.write("bz_print_no,package_box_sn1,package_box_sn2,sale_order_name,product_description,product_name,width,pcsn,date_of_FG_inbound,box_weight,date_of_production,quanlity_in_box,quality_guaran_period,nspector,storage_conditions,container_name,weight,customer_name,customer_description,thickness,mass_per_unit_area,length,box_type,sap_pcsn,box_length,box_width,box_high,material_type,joint_type\n"); bw.write(bz_print_no + "," + package_box_sn1 + "," @@ -149,6 +156,7 @@ public class PrintServiceImpl implements PrintService { + quality_guaran_period + "," + nspector + "," + storage_conditions + "," + + container_name + "," + NumberUtil.round(weight, 2).toString() + "KG," + box_jo.getString("customer_name") + "," + box_jo.getString("customer_description") + "," diff --git a/lms/nladmin-system/src/main/resources/language/i18n/en.js b/lms/nladmin-system/src/main/resources/language/i18n/en.js index 3384d62..b275da6 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/en.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/en.js @@ -3646,6 +3646,7 @@ var config = { "topCategoryCannotBeEmpty": "Is Top Category cannot be empty" }, "customer": { + "isSingleRollSingleBox": "Is single roll single box", "enterCustomerCodeOrName": "Enter customer code or name", "customerCode": "Customer Code", "customerName": "Customer Name", diff --git a/lms/nladmin-system/src/main/resources/language/i18n/id.js b/lms/nladmin-system/src/main/resources/language/i18n/id.js index 8f9c347..bf591a8 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/id.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/id.js @@ -3606,6 +3606,7 @@ var config = { "topCategoryCannotBeEmpty": "Apakah kategori teratas tidak boleh kosong" }, "customer": { + "isSingleRollSingleBox": "Apakah satu gulung per kotak", "enterCustomerCodeOrName": "Masukkan kode atau nama pelanggan", "customerCode": "Kode Pelanggan", "customerName": "Nama Pelanggan", diff --git a/lms/nladmin-system/src/main/resources/language/i18n/zh.js b/lms/nladmin-system/src/main/resources/language/i18n/zh.js index f3b6e92..edae6fd 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/zh.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/zh.js @@ -3690,6 +3690,7 @@ var config = { "topCategoryCannotBeEmpty": "是否顶级分类不能为空" }, "customer": { + "isSingleRollSingleBox": "是否单卷单箱", "enterCustomerCodeOrName": "输入客户编码或名称", "customerCode": "客户编码", "customerName": "客户名称", diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue index a94fce2..0c4fe50 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue @@ -135,6 +135,12 @@ {{ $t('wms.basedata.master.customer.yes') }} + + + {{ $t('wms.basedata.master.customer.no') }} + {{ $t('wms.basedata.master.customer.yes') }} + + @@ -196,6 +202,7 @@ + @@ -278,6 +285,7 @@ const defaultForm = { bz_print_no: null, shd_print_no: null, is_auto_table: '1', + is_single_roll_single_box: '0', bz_print_within: null, sales_owner: null } @@ -415,6 +423,9 @@ export default { }, autoTable(row) { return this.dict.label.is_used[row.is_auto_table] + }, + singleRollSingleBox(row) { + return this.dict.label.is_used[row.is_single_roll_single_box] } } }