diff --git a/build.gradle b/build.gradle index aeedde1..434d09f 100644 --- a/build.gradle +++ b/build.gradle @@ -132,3 +132,7 @@ sourceSets { } } } + +jar { + enabled = false +} diff --git a/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java index b9e3830..4f0d1bc 100644 --- a/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java +++ b/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java @@ -287,9 +287,9 @@ public class IfsCallErrorLogServiceImpl extends ServiceImpl newDetail=wcsIntegrationMapper.getPalletDetailsNewDetail(site, palletId); if(newDetail.isEmpty()){ @@ -1300,7 +1300,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { } } - //根据序列号去更新最新的 + // 调用pushPalletDetailNew方法推送组托数据 diff --git a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java index f6b3f26..70228c3 100644 --- a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java +++ b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java @@ -339,9 +339,9 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { // 添加过期日期参数 if (group.expiredDate != null) { - params.put("expiredDate", new SimpleDateFormat("yyyy-MM-dd").format(group.expiredDate)); + params.put("expiryDate", new SimpleDateFormat("yyyy-MM-dd").format(group.expiredDate)); } else { - params.put("expiredDate", null); + params.put("expiryDate", null); } ObjectMapper objectMapper = new ObjectMapper(); @@ -391,9 +391,9 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { // 添加过期日期参数 if (group.expiredDate != null) { - params.put("expiredDate", new SimpleDateFormat("yyyy-MM-dd").format(group.expiredDate)); + params.put("expiryDate", new SimpleDateFormat("yyyy-MM-dd").format(group.expiredDate)); } else { - params.put("expiredDate", null); + params.put("expiryDate", null); } ObjectMapper objectMapper = new ObjectMapper(); diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml index 0cd992b..142cdfc 100644 --- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml +++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml @@ -602,7 +602,7 @@ - update pallet set location_code = #{location},updated_by='wms_sys',updated_time=getdate() + update pallet set wcs_location = #{location},updated_by='wms_sys',updated_time=getdate() where site = #{site} and pallet_id = #{palletId}