Commit 25999cea950111aad3d339806d35fc2fea7d13dc

Authored by 周鸿
1 parent 1345c251

fix:昆山机加库获取mes单据信息修改;

src/main/java/com/huaheng/api/acs/service/AgvTaskCSCreateService.java
... ... @@ -158,6 +158,9 @@ public class AgvTaskCSCreateService {
158 158 if(StringUtils.isEmpty(task.getToPort())){
159 159 return;
160 160 }
  161 + if(task.getPort().equals(task.getToPort())){
  162 + return;
  163 + }
161 164 AgvTaskCS agvTask2=agvTaskCSService.saveAgvTaskBySimpleAgv(task,null);
162 165 }
163 166  
... ...
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
... ... @@ -463,7 +463,7 @@ public class MesServiceImpl extends BaseController implements MesService{
463 463 throw new ServiceException("获取mes URL地址失败!");
464 464 }
465 465 // 获取mes物料信息
466   - String parameter = url + "?lotNo=" + code + "&type=" + QuantityConstant.GUANGTENG;
  466 + String parameter = url + "?lotNo=" + code + "&type=" + QuantityConstant.JIJIA;
467 467 String str = OkHttpUtils.bodypost(parameter, "", QuantityConstant.WAREHOUSE_KS,"机加MES获取物料信息");
468 468 if (StringUtils.isEmpty(str)){
469 469 throw new ServiceException("根据跟踪单号获取物料信息失败!");
... ...
src/main/java/com/huaheng/common/constant/QuantityConstant.java
... ... @@ -726,6 +726,10 @@ public class QuantityConstant {
726 726 * 光腾
727 727 */
728 728 public static String GUANGTENG = "808";
  729 + /**
  730 + * 光腾
  731 + */
  732 + public static String JIJIA = "888";
729 733  
730 734 // 19、光腾区域
731 735  
... ...
src/main/resources/templates/task/taskHeader/taskHeaderV.html
... ... @@ -282,7 +282,7 @@
282 282 actions.push('<a class="btn btn-primary btn-xs ' + executeFlag + '" href="#" onclick="setLKPort(\'' + row.id + '\')"><i class="fa fa-check"></i>分配站台</a>');
283 283 }
284 284 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
285   - if ((row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV' || row.zoneCode === "XC"))) {
  285 + if ((row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV' || row.zoneCode === "XC" || row.zoneCode === "JLK"))) {
286 286 } else if (row.warehouseCode == 'XZ0001' && row.zoneCode == 'LK') {
287 287 } else if (row.warehouseCode == 'CS0001' && row.zoneCode == 'LK') {
288 288 } else {
... ... @@ -299,7 +299,7 @@
299 299 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
300 300 }
301 301 //
302   - if ((row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV' || row.zoneCode === "XC"))) {
  302 + if ((row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV' || row.zoneCode === "XC" || row.zoneCode === "JLK"))) {
303 303 if (row.zoneCode == "LK" && row.taskType == 300) {
304 304 actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
305 305 }
... ...