From 85bf46de8403f0a1e814d1133be11406285b4af2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 六月 2025 14:24:15 +0800
Subject: [PATCH] 测试,xiug bug
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 4
src/main/java/com/zy/nc/vo/ic_generalout_b.java | 2
src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java | 27 +++
src/main/java/com/zy/common/web/WcsController.java | 8
src/main/webapp/static/js/orderDetl/orderDetl.js | 1
src/main/java/com/zy/asrs/utils/MathUtils.java | 87 +++++++++
src/main/webapp/static/js/order/out.js | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 24 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8
src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java | 5
src/main/webapp/static/js/common.js | 12
src/main/webapp/static/js/orderPakin/order.js | 3
src/main/java/com/zy/asrs/controller/OrderController.java | 7
src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java | 5
src/main/webapp/views/orderPakout/out.html | 4
src/main/java/com/zy/asrs/entity/OrderDetl.java | 4
src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java | 5
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 5
src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java | 51 ++--
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 2
src/main/java/com/zy/asrs/controller/MobileController.java | 14 +
src/main/webapp/static/js/orderPakin/out.js | 2
src/main/webapp/static/js/locDetl/locDetl.js | 24 +-
src/main/java/com/zy/asrs/entity/param/MatParam.java | 38 ++++
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 5
src/main/webapp/static/js/orderPakout/order.js | 3
src/main/webapp/static/js/orderPakout/out.js | 4
src/main/webapp/static/js/order/order.js | 1
src/main/webapp/views/order/out.html | 4
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 9
src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | 7
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 132 +++++++-------
src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java | 10 +
src/main/resources/application.yml | 3
src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml | 8
35 files changed, 377 insertions(+), 153 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8cc990a..ca18214 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.utils.Synchro;
@@ -68,6 +69,9 @@
@Resource
private StaDescService staDescService;
+
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
@@ -209,10 +213,10 @@
Synchro.Copy(orderDetl, combMat);
combMat.setMatnr(orderDetl.getMatnr());
combMat.setBatch(orderDetl.getBatch());
- combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
+ combMat.setAnfme(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty()));
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
- combMat.setEnableQty(orderDetl.getAnfme() - orderDetl.getWorkQty());
+ combMat.setEnableQty(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty()));
combMats.add(combMat);
}
combParam.setCombMats(combMats);
@@ -240,9 +244,15 @@
Mat mat = matService.selectByMatnr(nccJcQilibcBarcodeflowWms.getWlbm());
MatParam matParam = new MatParam();
Synchro.Copy(mat, matParam);
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>().eq("order_no", nccJcQilibcBarcodeflowWms.getZkdh()).eq("matnr", mat.getMatnr()).eq("batch", nccJcQilibcBarcodeflowWms.getVbatchcode()));
+ if (orderDetlPakin == null) {
+ throw new CoolException("鏈壘鍒版鍗曞彿");
+ }
+ matParam.setStandby1(orderDetlPakin.getStandby1());
matParam.setOrderNo(nccJcQilibcBarcodeflowWms.getZkdh());
matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue());
+ matParam.setWeight(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
return R.ok().add(matParam);
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 141a825..1bac075 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MathUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.BeanUtils;
@@ -168,7 +169,7 @@
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ item.setAnfme(MathUtils.add(item.getAnfme(), orderDetl.getAnfme()));
item.setStandby1(param.getDefNumber());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -232,7 +233,7 @@
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
param.getItemId(), orderDetl.getStandby2(), orderDetl.getStandby3(),
orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ item.setAnfme(MathUtils.add(item.getAnfme() , orderDetl.getAnfme()));
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
@@ -272,7 +273,7 @@
totalQty = totalQty + orderDetl.getAnfme();
wrkQty = wrkQty + orderDetl.getWorkQty();
endQty = endQty + orderDetl.getQty();
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ double issued = Optional.of(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty())).orElse(0.0D);
if (issued > 0.0) {
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
for (LocDetl locDetl : locDetls) {
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 581e76b..3f0b992 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.StoreTypeService;
+import com.zy.asrs.utils.MathUtils;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -565,8 +566,9 @@
}
public Double getEnableQty() {
+
if (null != this.anfme && this.workQty != null) {
- return this.anfme - this.workQty;
+ return MathUtils.subtract(this.anfme, this.workQty);
}
// if (null != this.anfme && this.qty != null) {
// return this.anfme - this.qty;
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 5415c0d..af763b6 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -46,6 +46,10 @@
// 鐗╂枡鏁伴噺
private Double anfme;
+
+ // 鐗╂枡杈呮暟閲�
+ private Double weight;
+
// 鐗╂枡鏁伴噺
private Double enableQty;
diff --git a/src/main/java/com/zy/asrs/entity/param/MatParam.java b/src/main/java/com/zy/asrs/entity/param/MatParam.java
index e1db2ba..01feaaf 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatParam.java
@@ -1,5 +1,7 @@
package com.zy.asrs.entity.param;
+import com.baomidou.mybatisplus.annotations.TableField;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -10,6 +12,42 @@
*/
@Data
public class MatParam implements Serializable {
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ private String standby1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ private String standby2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ private String standby3 = "";
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ private String boxType1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ private String boxType2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ private String boxType3 = "";
/**
* 鍟嗗搧缂栧彿
*/
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
index 3840566..27be75a 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
@@ -13,15 +13,15 @@
@Repository
public interface OrderDetlPakoutMapper extends BaseMapper<OrderDetlPakout> {
- OrderDetlPakout selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3);
+ OrderDetlPakout selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3);
OrderDetlPakout selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch,
- @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3);
+ @Param("brand") String brand, @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3);
List<OrderDetlPakout> selectWorkingDetls(Long orderId);
@@ -29,30 +29,31 @@
Integer getPakoutPageCount(Map<String, Object> map);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int increase(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int decrease(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
+ int modifyStatus(@Param("orderId") Long orderId, @Param("status") Integer status);
int addToLogTable(OrderDetlPakout orderDetl);
- int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int increaseQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int increaseQtyById(@Param("id")Long id, @Param("qty")Double qty);
+ int increaseQtyById(@Param("id") Long id, @Param("qty") Double qty);
- int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("workQty")Double workQty);
+ int increaseWorkQty(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("workQty") Double workQty);
+ int increaseWorkQtyById(@Param("id") Long id, @Param("workQty") Double workQty);
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
index 6998a7a..bc02a23 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
@@ -29,8 +29,10 @@
boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
boolean increaseQtyById(Long id, Double qty);
+
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderId
* @param matnr
* @param batch
@@ -38,4 +40,7 @@
* @return
*/
boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty);
+
+ boolean increaseWorkQtyById(Long id, Double workQty);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index d8e1c93..585613e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -13,6 +13,7 @@
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
import com.zy.common.model.enums.WorkNoType;
@@ -531,7 +532,7 @@
ArrayList<PickMatParam> maps = new ArrayList<>();
for (OrderDetl orderDetl : list) {
//鍓╀綑鍙敤鏁伴噺
- double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
+ double count = MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty());
if (count <= 0) {
continue;
}
@@ -587,6 +588,7 @@
param.getCombMats().forEach(elem -> {
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
+ detlDto.setWeight(elem.getWeight());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
@@ -655,6 +657,7 @@
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
detlDto.setOrderNo(elem.getOrderNo());
+ detlDto.setWeight(elem.getWeight());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
@@ -688,6 +691,7 @@
waitPakin.setStandby1(detlDto.getStandby1());
waitPakin.setStandby2(detlDto.getStandby2());
waitPakin.setStandby3(detlDto.getStandby3());
+ waitPakin.setWeight(detlDto.getWeight());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -1063,7 +1067,7 @@
}
//鍙嚭搴撴暟閲� = 璁㈠崟鏁伴噺 - 浣滀笟涓暟閲�
- Double outQty = orderDetl.getAnfme() - orderDetl.getWorkQty();
+ Double outQty = MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty());
if (outQty <= 0) {
break;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 58fba3f..ab2452d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -527,74 +527,74 @@
// 鍒嗙被
Long tagId;
// 涓�绾у垎绫�
- if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
- Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("name", matParam.getGroupCode()));
- if (priTag == null) {
- Tag top = tagService.getTop();
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(top.getId());
- priTag = new Tag(
- null, // 缂栧彿
- matParam.getGroupCode(), // 鍚嶇О
- top.getId(), // 鐖剁骇
- top.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 2, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- // 浜岀骇鍒嗙被
- Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
- if (secTag == null) {
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(priTag.getId());
- secTag = new Tag(
- null, // 缂栧彿
- matParam.getGroupName(), // 鍚嶇О
- priTag.getId(), // 鐖剁骇
- priTag.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 3, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- tagId = secTag.getId();
- } else {
- tagId = tagService.getTop().getId();
- }
+// if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
+// Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("name", matParam.getGroupCode()));
+// if (priTag == null) {
+// Tag top = tagService.getTop();
+// NodeUtils nodeUtils = new NodeUtils();
+// nodeUtils.executePath(top.getId());
+// priTag = new Tag(
+// null, // 缂栧彿
+// matParam.getGroupCode(), // 鍚嶇О
+// top.getId(), // 鐖剁骇
+// top.getName(), // 鐖剁骇鍚嶇О
+// nodeUtils.path.toString(), // 鍏宠仈璺緞
+// nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+// 0, // 绫诲瀷
+// null, // 璐熻矗浜�
+// null, // 鍥剧墖
+// null, // 绠�瑕佹弿杩�
+// null, // 鏁伴噺
+// 2, // 绛夌骇
+// null, // 鎺掑簭
+// 1, // 鐘舵��
+// now, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// now, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+// if (tagMapper.insert(priTag) == 0) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
+// // 浜岀骇鍒嗙被
+// Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
+// if (secTag == null) {
+// NodeUtils nodeUtils = new NodeUtils();
+// nodeUtils.executePath(priTag.getId());
+// secTag = new Tag(
+// null, // 缂栧彿
+// matParam.getGroupName(), // 鍚嶇О
+// priTag.getId(), // 鐖剁骇
+// priTag.getName(), // 鐖剁骇鍚嶇О
+// nodeUtils.path.toString(), // 鍏宠仈璺緞
+// nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+// 0, // 绫诲瀷
+// null, // 璐熻矗浜�
+// null, // 鍥剧墖
+// null, // 绠�瑕佹弿杩�
+// null, // 鏁伴噺
+// 3, // 绛夌骇
+// null, // 鎺掑簭
+// 1, // 鐘舵��
+// now, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// now, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+// if (tagMapper.insert(secTag) == 0) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
+// tagId = secTag.getId();
+// } else {
+// tagId = tagService.getTop().getId();
+// }
mat.sync(matParam);
- mat.setTagId(tagId);
+ mat.setTagId(Long.parseLong(matParam.getGroupCode()));
mat.setStatus(1);
mat.setCreateTime(now);
mat.setUpdateTime(now);
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
index c2c47e2..ce6b21c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
@@ -98,4 +98,14 @@
public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty) > 0;
}
+
+ /**
+ * 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ * @param workQty
+ * @return
+ */
+ @Override
+ public boolean increaseWorkQtyById(Long id, Double workQty) {
+ return this.baseMapper.increaseWorkQtyById(id, workQty) > 0;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index 101437c..63e04d5 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -345,7 +345,7 @@
}
whsTransBillBodyVO = new WhsTransBillBodyVO();
- whsTransBillBodyVO.setCstateid(nccScPcdaWms.getVcode());
+ whsTransBillBodyVO.setCstateid(nccScPcdaWms.getPkBatchcode());
String remark = orderDetl.getRemark();
//if (!Cools.isEmpty(remark)) {
@@ -403,7 +403,8 @@
generalout_b.setCotherwhid(rukucangku);
generalout_b.setCothercalbodyvid(storeType2.getDepartmentId());
- generalout_b.setNshouldassistnum(orderDetl.getQty());
+ //generalout_b.setNshouldassistnum(orderDetl.getQty());
+ generalout_b.setNnum(orderDetl.getQty());
generalout_b.setVbatchcode(orderDetl.getBatch());
ic_purchasein_bs.add(generalout_b);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index dadd3b0..93c21e4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -100,6 +100,9 @@
@Autowired
private InventoryCheckOrderDetlService checkOrderDetlService;
+ @Resource
+ private OrderDetlPakoutService orderDetlPakoutService;
+
@Override
@Transactional
public String startupFullPutStore(FullStoreParam param, Long userId) {
@@ -469,15 +472,15 @@
continue;
}
// OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()
, locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
- if (orderDetl == null) {
- orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getBrand()
+ if (orderDetlPakout == null) {
+ orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getBrand()
, locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
}
WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(orderDetl);
+ wrkDetl.sync(orderDetlPakout);
wrkDetl.setZpallet(wrkMast.getBarcode());
wrkDetl.setIoTime(now);
wrkDetl.setWrkNo(workNo);
@@ -488,7 +491,7 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(userId);
- wrkDetl.setThreeCode(orderDetl.getId() + "");
+ wrkDetl.setThreeCode(orderDetlPakout.getId() + "");
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -497,11 +500,12 @@
// throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
// }
// orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
- OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
- orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()
- , locDto.getAnfme());
- OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetl.getOrderId(), 2L, userId);
+ orderDetlPakoutService.increaseWorkQtyById(orderDetlPakout.getId(), locDto.getAnfme());
+// OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
+// orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+// orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()
+// ,locDto.getAnfme() );
+ OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetlPakout.getOrderId(), 2L, userId);
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(taskDto.getLocNo());
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index fa53068..cf2fafc 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -7,6 +7,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
@@ -67,7 +68,7 @@
continue;
}
orderDetl.setWorkQty(orderDetl.getQty());
- orderDetl.setAnfme(orderDetl.getAnfme() - orderDetl.getQty());
+ orderDetl.setAnfme(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getQty()));
orderDetl.setQty(0D);
orderDetlService.updateById(orderDetl);
}
@@ -97,11 +98,11 @@
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ detlDto.setAnfme(MathUtils.add(detlDto.getAnfme(), detail.getAnfme()));
OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert orderDetl != null;
- orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
+ orderDetl.setAnfme(MathUtils.add(orderDetl.getAnfme(), detail.getAnfme()));
} else {
list.add(dto);
orderDetlList.add(detail);
@@ -141,7 +142,7 @@
continue;
}
if (orderDetlSou.beSimilar(orderDetl)) {
- double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
+ double v = MathUtils.subtract(orderDetlSou.getAnfme(), orderDetlSou.getQty());
if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
orderDetlSou.setQty(orderDetlSou.getAnfme());
orderDetl.setQty(orderDetl.getQty() - v);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index cefe972..6eaf9a2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -6,6 +6,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.MathUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -232,7 +233,7 @@
// wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
if (!orderDetlPakoutService.increaseQtyById(orderDetlPakout.getId(), wrkDetl.getAnfme())) {
- //if (!orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme())) {
+ //if (!orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme())) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -570,7 +571,7 @@
if (orderDetl.getAnfme() <= wrkDetl.getAnfme()) {
orderDetlService.deleteById(orderDetl.getId());
} else {
- orderDetl.setAnfme(orderDetl.getAnfme() - wrkDetl.getAnfme());
+ orderDetl.setAnfme(MathUtils.subtract(orderDetl.getAnfme(), wrkDetl.getAnfme()));
orderDetlService.updateById(orderDetl);
}
orderDetl2.setId(null);
diff --git a/src/main/java/com/zy/asrs/utils/MathUtils.java b/src/main/java/com/zy/asrs/utils/MathUtils.java
new file mode 100644
index 0000000..5416894
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/MathUtils.java
@@ -0,0 +1,87 @@
+package com.zy.asrs.utils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+public class MathUtils {
+
+
+ // 榛樿闄ゆ硶杩愮畻绮惧害
+ private static final int DEFAULT_DIV_SCALE = 10;
+
+ /**
+ * 绮剧‘鍔犳硶
+ */
+ public static BigDecimal add(BigDecimal... values) {
+ BigDecimal result = BigDecimal.ZERO;
+ for (BigDecimal value : values) {
+ result = result.add(value);
+ }
+ return result;
+ }
+
+ /**
+ * 绮剧‘鍔犳硶
+ */
+ public static Double add(Double... values) {
+ BigDecimal result = BigDecimal.ZERO;
+ for (Double value : values) {
+ result = result.add(BigDecimal.valueOf(value));
+ }
+ return result.doubleValue();
+ }
+
+ /**
+ * 绮剧‘鍑忔硶
+ */
+ public static BigDecimal subtract(BigDecimal a, BigDecimal b) {
+ return a.subtract(b);
+ }
+
+ /**
+ * 绮剧‘鍑忔硶
+ */
+ public static Double subtract(Double a, Double b) {
+ return BigDecimal.valueOf(a).subtract(BigDecimal.valueOf(b)).doubleValue();
+ }
+
+ /**
+ * 绮剧‘涔樻硶
+ */
+ public static BigDecimal multiply(BigDecimal... values) {
+ BigDecimal result = BigDecimal.ONE;
+ for (BigDecimal value : values) {
+ result = result.multiply(value);
+ }
+ return result;
+ }
+
+ /**
+ * 绮剧‘闄ゆ硶锛岄粯璁や繚鐣�10浣嶅皬鏁帮紝鍥涜垗浜斿叆
+ */
+ public static BigDecimal divide(BigDecimal a, BigDecimal b) {
+ return a.divide(b, DEFAULT_DIV_SCALE, RoundingMode.HALF_UP);
+ }
+
+ /**
+ * 绮剧‘闄ゆ硶锛岃嚜瀹氫箟绮惧害鍜岃垗鍏ユā寮�
+ */
+ public static BigDecimal divide(BigDecimal a, BigDecimal b, int scale, RoundingMode mode) {
+ return a.divide(b, scale, mode);
+ }
+
+ /**
+ * 姣旇緝澶у皬锛歛 > b 杩斿洖 1锛沘 < b 杩斿洖 -1锛涚浉绛夎繑鍥� 0
+ */
+ public static int compare(BigDecimal a, BigDecimal b) {
+ return a.compareTo(b);
+ }
+
+ /**
+ * 杞崲涓哄瓧绗︿覆杈撳嚭锛岃嚜鍔ㄥ幓闄ゆ棤鏁堥浂
+ */
+ public static String toPlainString(BigDecimal value) {
+ return value.stripTrailingZeros().toPlainString();
+ }
+}
+
diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
index 650c6cf..5e1ffee 100644
--- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
+++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
@@ -124,48 +124,72 @@
@Transactional
public List<Order> selectComplete() {
List<OrderPakin> orderPakinList = orderPakinService.selectComplete();
+ if (orderPakinList == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
}
@Transactional
public List<Order> selectComplete8() {
List<OrderPakin> orderPakinList = orderPakinService.selectComplete8();
+ if (orderPakinList == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
}
@Transactional
public boolean addToLogTableOrder(Order order) {
OrderPakin orderPakin = OrderTransFormationUtil.transformationPakin(order);
+ if (orderPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return orderPakinService.addToLogTable(orderPakin);
}
@Transactional
public List<Order> selectOrderNoL(String orderNo) {
List<OrderPakin> orderPakinList = orderPakinService.selectorderNoL(orderNo);
+ if (orderPakinList == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
}
@Transactional
public Order selectOrderMoveStatus() {
OrderPakin orderPakin = orderPakinService.selectOrderMoveStatus();
+ if (orderPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return OrderTransFormationUtil.transformationOrderPakin(orderPakin);
}
@Transactional
public Order selectOrderMoveStatusInitial() {
OrderPakin orderPakin = orderPakinService.selectOrderMoveStatusInitial();
+ if (orderPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return OrderTransFormationUtil.transformationOrderPakin(orderPakin);
}
@Transactional
public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
+ if (orderDetlPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
}
@Transactional
public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
+ if (orderDetlPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
}
@@ -173,6 +197,9 @@
public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
List<OrderDetlPakin> orderDetlPakins = OrderTransFormationUtil.transformationDetlListPakin(orderDetls);
OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
+ if (orderDetlPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b1bc5a0..e376d22 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -89,11 +89,11 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
if (param.getBarcode().startsWith("11")) {
locTypeDto.setLocType2((short) 1);
- }else if (param.getBarcode().startsWith("13")) {
+ } else if (param.getBarcode().startsWith("13")) {
locTypeDto.setLocType2((short) 2);
- }else if (param.getBarcode().startsWith("16")) {
+ } else if (param.getBarcode().startsWith("16")) {
locTypeDto.setLocType2((short) 3);
- }else {
+ } else {
return R.error("鏈煡鎵樼洏鐮佽鍒�");
}
@@ -185,7 +185,7 @@
// dto.setStaNo(103);
// LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
// dto.setLocNo(locMastxx.getLocNo());
-// dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));
+// dto.setWorkNo(Integer.parseInt((System.currentTimeMillis() + "").substring(10)));
StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
if (dto == null) {
diff --git a/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java b/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
index 6c2acdf..64e03d0 100644
--- a/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
+++ b/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
@@ -88,6 +88,11 @@
*/
private String wmsMemo;
+ /**
+ *
+ */
+ private String ckbm;
+
@Override
public boolean equals(Object that) {
if (this == that) {
diff --git a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
index f9751b8..3df40cb 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
@@ -135,6 +135,11 @@
private String wlbm;
/**
+ *
+ */
+ private String vbatchcode;
+
+ /**
*
*/
private String wlmc;
diff --git a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
index 4dfdfb1..b2d4976 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -195,7 +195,6 @@
user.setUsername(nccJcRyWms.getRybm());
user.setNickname(nccJcRyWms.getRymc());
user.setMobile(nccJcRyWms.getRybm());
- user.setRoleId(12L);
user.setStatus(1);
userService.updateById(user);
}
@@ -289,11 +288,11 @@
matParam.setSpecs(vGetBdMaterial.get瑙勬牸());
matParam.setModel(vGetBdMaterial.get鍨嬪彿());
matParam.setUnit(vGetBdMaterial.get涓诲崟浣�());
+ matParam.setManu(vGetBdMaterial.get杈呭崟浣�());
matParam.setMemo(vGetBdMaterial.get澶囨敞());
- matParam.setName(vGetBdMaterial.get鐗╂枡绠�绉皍8鏃у搧鍚�());
+ matParam.setSku(vGetBdMaterial.get鐗╂枡绠�绉皍8鏃у搧鍚�());
matParam.setOrigin(vGetBdMaterial.get涓昏緟鎹㈢畻姣�());
- matParam.setGroupCode(vGetBdMaterial.get瀛樿揣鍒嗙被缂栫爜());
- matParam.setGroupName(vGetBdMaterial.get瀛樿揣鍒嗙被鍚嶇О());
+ matParam.setGroupCode(priTag.getId() + "");
matDetails.add(matParam);
}
if (!matDetails.isEmpty()) {
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index a16da33..7ad8344 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -91,6 +91,7 @@
detlDto = new DetlDto();
detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
+ detlDto.setBatch(nccSaleXsfhmxWms.getVbatchcode());
detlDto.setWeight(nccSaleXsfhmxWms.getNastnum().doubleValue());
detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
detlDto.setLineNumber(i);
@@ -105,6 +106,7 @@
param.setOrderDetails(orderDetails);
openService.pakoutOrderCreate(param);
nccSaleXsfhmxWmsService.updateBatchById(map.get(key));
+ size++;
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/nc/vo/ic_generalout_b.java b/src/main/java/com/zy/nc/vo/ic_generalout_b.java
index 23f16d2..d12f780 100644
--- a/src/main/java/com/zy/nc/vo/ic_generalout_b.java
+++ b/src/main/java/com/zy/nc/vo/ic_generalout_b.java
@@ -28,4 +28,6 @@
private String cotherwhid;
private String cothercalbodyvid;
+
+ private Double nnum;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1da2931..195f2a6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -31,6 +31,9 @@
jdbc-url: jdbc:mysql://127.0.0.1:3306/wmsdata
username: root
password: root
+# jdbc-url: jdbc:mysql://192.168.5.61:3306/wmsdata
+# username: liku
+# password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml
index b54c656..57dad35 100644
--- a/src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml
@@ -248,4 +248,12 @@
<include refid="standbyAll"></include>
</update>
+ <update id="increaseWorkQtyById">
+ update man_order_detl_pakout
+ set work_qty = work_qty + #{workQty}
+ where 1=1
+ and id = #{id}
+ </update>
+
+
</mapper>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 224d49c..0b0f827 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -187,17 +187,17 @@
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
+ ,{field: 'sku', align: 'center',title: 'U8鏃у搧鍚�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
+ ,{field: 'manu', align: 'center',title: '杈呭崟浣�'}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: '鐗╂枡绠�绉�'}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
- ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+ ,{field: 'origin', align: 'center',title: '鎹㈢畻姣斾緥'}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
@@ -224,10 +224,13 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
+ ,{field: 'sku', align: 'center',title: 'U8鏃у搧鍚�'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵规'}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'weight', align: 'center',title: '杈呮暟閲�'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'manu', align: 'center',title: '杈呭崟浣�'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
@@ -235,13 +238,10 @@
,{field: 'standby1$', align: 'center',title: '浠撳簱'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
- ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 7d2aefa..8d78ea6 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -4,20 +4,22 @@
{type: 'checkbox'},
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
+ ,{field: 'sku', align: 'center',title: 'U8鏃у搧鍚�'}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
+ ,{field: 'weight', align: 'center',title: '杈呮暟閲�'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'manu', align: 'center',title: '杈呭崟浣�'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
,{field: 'standby1$', align: 'center',title: '浠撳簱'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
@@ -25,18 +27,16 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '杈呮暟閲�'}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'appeTime$', align: 'center',title: '鍏ュ簱鏃堕棿'}
,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�',
templet: function(d) {
// 鏍规嵁鏉′欢鍒ゆ柇瀛椾綋棰滆壊
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e229124..d5f9d4d 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -134,6 +134,7 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'specs', title: '瑙勬牸'},
{field: 'batch', title: '鎵瑰彿'},
+ {field: 'weight', title: '杈呮暟閲�'},
{field: 'anfme', title: '寰呭畬缁撴暟閲�'},
{field: 'qty', title: '寰呬笂鎶ユ暟閲�', style: 'font-weight: bold'},
{field: 'workQty', title: '宸蹭笂鎶ユ暟閲�'},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index be85831..2e0ad34 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -34,7 +34,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index caef270..a4ab838 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -44,7 +44,6 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
-
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 6e95f20..e44165e 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -111,7 +111,7 @@
layer.open({
type: 1,
title: false,
- area: '820px',
+ area: '970px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -132,6 +132,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
+ {field: 'weight', title: '杈呮暟閲�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
diff --git a/src/main/webapp/static/js/orderPakin/out.js b/src/main/webapp/static/js/orderPakin/out.js
index a4aaeb0..0704d02 100644
--- a/src/main/webapp/static/js/orderPakin/out.js
+++ b/src/main/webapp/static/js/orderPakin/out.js
@@ -34,7 +34,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index e079284..c544f6e 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -112,7 +112,7 @@
layer.open({
type: 1,
title: false,
- area: '820px',
+ area: '970px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -133,6 +133,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
+ {field: 'weight', title: '杈呮暟閲�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index a7ba719..3f3425f 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -34,8 +34,9 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'weight$', align: 'center',title: '杈呮暟閲�'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
@@ -161,6 +162,7 @@
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
{field: 'batch', title: '搴忓垪鐮�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'weight', title: '杈呮暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'frozen$', title: '鏄庣粏', align: 'center', width: 90, templet: '#locFrozen'},
{field: 'frozenLoc$', title: '搴撲綅', align: 'center', width: 90, templet: '#locFrozenLoc'},
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index db2ebc4..14136ce 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -107,9 +107,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">搴忓垪鐮�:</label>
+ <label class="layui-form-label">鎵规:</label>
<div class="layui-input-inline">
- <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>
+ <input name="batch" class="layui-input" placeholder="鎵规"/>
</div>
</div>
<!-- <div class="layui-inline">-->
diff --git a/src/main/webapp/views/orderPakout/out.html b/src/main/webapp/views/orderPakout/out.html
index 3772975..b79b645 100644
--- a/src/main/webapp/views/orderPakout/out.html
+++ b/src/main/webapp/views/orderPakout/out.html
@@ -107,9 +107,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">搴忓垪鐮�:</label>
+ <label class="layui-form-label">鎵规:</label>
<div class="layui-input-inline">
- <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>
+ <input name="batch" class="layui-input" placeholder="鎵规"/>
</div>
</div>
<!-- <div class="layui-inline">-->
--
Gitblit v1.9.1