root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:添加ERP配置文件；add:转运

Browse Source
This commit is contained in:
zhangzq
2024-12-09 23:27:09 +08:00
parent 9a47d3e084
commit 9a35f86b2a
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java
View File

@@ -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<Map> transf(@RequestBody JSONObject param) {
HashMap result = MapOf.of("", "");
return new ResponseEntity<>(result,HttpStatus.OK);
}
@PostMapping("transfConfirm")
@SaIgnore
@Log("转运确认")
public ResponseEntity<TableDataInfo> transfConfirm(@RequestBody JSONObject param) {
HashMap result = MapOf.of("", "");
return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
}
}

6
wms_pro/hd/nladmin-system/src/main/resources/kdwebapi.properties Normal file
View File

@@ -0,0 +1,6 @@
appId=295539_RY4pS/CH0vl8TfUo652sR+1KULwdQNOG
appSecret=0d47d08ee5014643b91a764e121e0bcb
userName=???
pwd=ty.87016362
serverUrl=http://192.168.16.249/k3cloud/
dCID=65b078e7ea0ce6