diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java index 4698fe63..b4f116ce 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java @@ -10,6 +10,7 @@ import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.domain.exception.handler.ApiError; +import org.nl.common.utils.MapOf; import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService; import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; import org.nl.wms.dispatch_manage.point.service.ISchBasePointService; @@ -21,6 +22,7 @@ import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater; import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo; import org.nl.wms.pda_manage.devicemanage.dto.ComTp; import org.nl.wms.pda_manage.palletio.service.PalletIostorinvService; +import org.nl.wms.pda_manage.palletio.service.dto.LabelValueVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -31,7 +33,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.text.Format; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *设备操控 @@ -105,7 +109,20 @@ public class DeviceManageController { wmsToAcsService.toCommand(device_code,"1",vehicleInfo.getH()); return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); } - + @PostMapping("transf") + @SaIgnore + @Log("输送线转运") + public ResponseEntity transf(@RequestBody JSONObject param) { + HashMap result = MapOf.of("", ""); + return new ResponseEntity<>(result,HttpStatus.OK); + } + @PostMapping("transfConfirm") + @SaIgnore + @Log("转运确认") + public ResponseEntity transfConfirm(@RequestBody JSONObject param) { + HashMap result = MapOf.of("", ""); + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/resources/kdwebapi.properties b/wms_pro/hd/nladmin-system/src/main/resources/kdwebapi.properties new file mode 100644 index 00000000..6a09e29b --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/resources/kdwebapi.properties @@ -0,0 +1,6 @@ +appId=295539_RY4pS/CH0vl8TfUo652sR+1KULwdQNOG +appSecret=0d47d08ee5014643b91a764e121e0bcb +userName=??? +pwd=ty.87016362 +serverUrl=http://192.168.16.249/k3cloud/ +dCID=65b078e7ea0ce6