src/main/java/com/zy/asrs/entity/BasArm.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/BasArmMast.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/utils/Utils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BasArmMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/BasArm.java
@@ -48,6 +48,20 @@ @ApiModelProperty(value= "") private Integer status; /** * 拆垛位 */ @ApiModelProperty(value= "拆垛位") @TableField("sorting_line_sou") private Integer sortingLineSou; /** * 码垛位 */ @ApiModelProperty(value= "码垛位") @TableField("sta_no_sou") private Integer staNoSou; public BasArm() {} public BasArm(Integer armNo,Integer staNo,Integer sortingLine,Integer status) { src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -124,6 +124,7 @@ public BasArmMast(TaskArmReportParam param) { this.orderNo = param.getOrderNo(); this.sku = param.getSku(); this.matnr = param.getSku(); this.po = param.getPo(); this.upc = param.getUpc(); this.supplier = param.getSupplier(); src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -14,6 +14,7 @@ import com.zy.asrs.service.*; import com.zy.asrs.utils.MatUtils; import com.zy.asrs.utils.OrderInAndOutUtil; import com.zy.asrs.utils.Utils; import com.zy.common.model.DetlDto; import com.zy.common.utils.NodeUtils; import lombok.extern.slf4j.Slf4j; @@ -21,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.rmi.CORBA.Util; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -598,13 +600,14 @@ @Transactional public void taskArmReport(TaskArmReportParam param) { BasArmMast basArmMast = new BasArmMast(param); List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line", basArmMast.getSortingLine())); List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line_sou", basArmMast.getSortingLine())); for (BasArm basArm : basArmList) { if (basArm.getStatus()!=1){ continue; } basArmMast.setArmNo(basArm.getArmNo()); basArmMast.setStaNo(basArm.getStaNo()); basArmMast.setStaNo(basArm.getStaNoSou()); break; } basArmMastService.insert(basArmMast); } @@ -614,7 +617,7 @@ public void taskArmCycleResult(TaskArmCycleResultParam param) { BasArmMast basArmMast = basArmMastService.selectOne( new EntityWrapper<BasArmMast>() .eq("sorting_line", param.getStaNo()) .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getStaNo()))) .eq("arm_no", param.getArm_no()) .eq("status", 1) ); @@ -631,7 +634,7 @@ public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) { BasArmMast basArmMast = basArmMastService.selectOne( new EntityWrapper<BasArmMast>() .eq("sorting_line", Integer.getInteger(param.getId())) .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getId()))) .eq("arm_no", param.getArm_no()) .eq("status", 2) ); @@ -646,7 +649,7 @@ public void taskArmWorkOrderStatus(OrderArmEndParam param) { BasArmMast basArmMast = basArmMastService.selectOne( new EntityWrapper<BasArmMast>() .eq("sorting_line", Integer.getInteger(param.getStaNo())) .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getStaNo()))) .eq("arm_no", param.getArm_no()) .eq("status", 5) ); src/main/java/com/zy/asrs/utils/Utils.java
@@ -35,6 +35,91 @@ return (float) Arith.multiplys(2, f, 1); } public static int armStaNo(int armNo,int staNo) { switch (armNo){ case 1: switch (staNo){ case 0: return 7; case 1: return 8; case 2: return 101; case 3: return 102; default: return 0; } case 2: switch (staNo){ case 0: return 5; case 1: return 6; case 2: return 101; case 3: return 102; default: return 0; } case 3: switch (staNo){ case 0: return 3; case 1: return 4; case 2: return 101; case 3: return 102; default: return 0; } case 4: switch (staNo){ case 0: return 1; case 1: return 2; case 2: return 101; case 3: return 102; default: return 0; } case 5: switch (staNo){ case 0: return 11; case 1: return 12; case 2: return 101; case 3: return 102; default: return 0; } case 6: switch (staNo){ case 0: return 13; case 1: return 14; case 2: return 101; case 3: return 102; default: return 0; } default: return 0; } } public static String zerofill(String msg, Integer count) { if (msg.length() == count) { return msg; src/main/resources/application.yml
@@ -11,7 +11,7 @@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # url: jdbc:sqlserver://127.0.0.1:49847;databasename=jshdasrs url: jdbc:sqlserver://10.10.10.235:1433;databasename=jshdasrs url: jdbc:sqlserver://10.10.10.198:1433;databasename=jshdasrs # url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs username: sa password: sa@123 @@ -77,15 +77,15 @@ arm: # 地址 address: URL: http://58.210.10.90:28090 URL: http://10.10.10.171:7002 #根据参数获取码垛数量 QuantityOfPalletizing: api QuantityOfPalletizing: adaptor/api/wcs/getPalletizingNumber #分拣线对接 line: # 地址 address: URL: http://58.210.10.90:28090 PATH: API URL: http://10.10.10.244:8080 PATH: orderPakInAll #erp对接 erp: src/main/resources/mapper/BasArmMapper.xml
@@ -9,6 +9,8 @@ <result column="sta_no" property="staNo" /> <result column="sorting_line" property="sortingLine" /> <result column="status" property="status" /> <result column="sta_no_sou" property="staNoSou" /> <result column="sorting_line_sou" property="sortingLineSou" /> </resultMap>