src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -172,19 +172,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -318,19 +318,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -317,19 +317,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -317,19 +317,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -160,19 +160,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -159,19 +159,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -274,19 +274,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -274,19 +274,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -32,9 +32,9 @@ // 序列码 private String batch = ""; private String brand = ""; private String standby1 = ""; private String standby2 = ""; private String standby3 = ""; private String standby1 = "1"; private String standby2 = "1"; private String standby3 = "1"; private String boxType1 = "1"; private String boxType2 = "1"; src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -29,9 +29,9 @@ private String batch; private String specs = ""; private String brand = ""; private String standby1 = ""; private String standby2 = ""; private String standby3 = ""; private String standby1 = "1"; private String standby2 = "1"; private String standby3 = "1"; private String boxType1 = "1"; private String boxType2 = "1"; private String boxType3 = "1"; src/main/java/com/zy/asrs/entity/param/PickMatParam.java
@@ -25,19 +25,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -39,19 +39,19 @@ * 备用1 */ @ApiModelProperty(value= "备用1") private String standby1 = ""; private String standby1 = "1"; /** * 备用2 */ @ApiModelProperty(value= "备用2") private String standby2 = ""; private String standby2 = "1"; /** * 备用3 */ @ApiModelProperty(value= "备用3") private String standby3 = ""; private String standby3 = "1"; /** * 备用1 src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
@@ -11,9 +11,9 @@ private String batch = ""; private String grade = ""; private String brand = ""; private String standby1 = ""; private String standby2 = ""; private String standby3 = ""; private String standby1 = "1"; private String standby2 = "1"; private String standby3 = "1"; private String boxType1 = "1"; private String boxType2 = "1"; private String boxType3 = "1"; src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -94,7 +94,7 @@ wrkMastSta1.setStaEnd(1028); break; } else { wrkMastSta1.setStaEnd(2021); wrkMastSta1.setStaEnd(2024); break; } case 5: src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
@@ -87,7 +87,7 @@ for (OptimizedLockerPacking3Utils.Locker locker:packingSolution.lockers) { for (String mantnr : locker.contents.keySet()){ // System.out.println(mantnr+"<===>"+locker.contents.get(mantnr)); String[] split = mantnr.split(Pattern.quote(sign_F)); String[] split = mantnr.split(Pattern.quote(sign_F),-1); OrderToLine.MatList mat = new OrderToLine.MatList( split[0], // matnr -> sku split[1], // supp -> po -> s1 src/main/resources/application.yml
@@ -94,9 +94,9 @@ #计时器上报开关 ErpReportOld: false #获取单据开关 InboundOrderSwitch: true InboundOrderSwitch: false #登录接口开关 LoginAuthenticationSwitch: true LoginAuthenticationSwitch: false #上报、审核单据开关 ReviewOrderSwitch: false # 地址 src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -132,7 +132,7 @@ where 1=1 and order_id = #{orderId} and matnr = #{matnr} <include refid="standbyAll"></include> <!-- <include refid="standbyAll"></include>--> </select> <select id="selectItemByOrderNo" resultMap="BaseResultMap"> src/main/webapp/views/index.html
@@ -10,8 +10,8 @@ <link rel="stylesheet" href="../static/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../static/css/admin.css?v=318" media="all"> <link rel="stylesheet" href="../static/css/loader.css" media="all"> <link rel="stylesheet" href="../static/css/layx.min.css" type="text/css"/> <script src="../static/js/tools/layx.min.js"></script> <!-- <link rel="stylesheet" href="../static/css/layx.min.css" type="text/css"/>--> <!-- <script src="../static/js/tools/layx.min.js"></script>--> <style> .layui-logo img { width: 25px;
