|
@@ -122,11 +122,11 @@ public class StationUserController extends SuperController<StationUserService, L
|
|
|
@ApiOperation(value = "新增上下料用户", notes = "新增上下料用户")
|
|
|
@PostMapping("/saveAll")
|
|
|
public R<Boolean> saveAll(@RequestParam(value = "stationIds[]") List<String> stationIds, @RequestParam(value = "userIds[]") List<String> userIds) {
|
|
|
- List<StationUser> stationUserList = Lists.newArrayList();
|
|
|
- for(int i=0; i<stationIds.size(); i++){
|
|
|
- if(StringUtil.isEmpty(userIds.get(i))) continue;
|
|
|
- String[] idArr = userIds.get(i).split(",");
|
|
|
- for(int j=0;j<idArr.length; j++){
|
|
|
+ List<StationUser> stationUserList = Lists.newArrayList();
|
|
|
+ for (int i = 0; i < stationIds.size(); i++) {
|
|
|
+ if (StringUtil.isEmpty(userIds.get(i))) continue;
|
|
|
+ String[] idArr = userIds.get(i).split(",");
|
|
|
+ for (int j = 0; j < idArr.length; j++) {
|
|
|
StationUser stationUser = new StationUser();
|
|
|
stationUser.setStationId(Long.parseLong(stationIds.get(i)));
|
|
|
stationUser.setUserId(Long.parseLong(idArr[j]));
|
|
@@ -299,8 +299,8 @@ public class StationUserController extends SuperController<StationUserService, L
|
|
|
String isXbk = (goalType.contains("365") || goalType.contains("366")) && start.contains("CNC0") ? "1" : "0";
|
|
|
//刀具待取刀具号或刀具规格处理 (空则无后续取 反之则取指定刀具)
|
|
|
String confBatchNo = !model.containsKey("rd") && !model.containsKey("specification") ? "" : (model.containsKey("rd") ? model.get("rd").toString() : model.get("specification").toString());
|
|
|
- //刀具申请校验处理
|
|
|
- String isApply = !model.containsKey("isApply")? "" : model.get("isApply").toString();
|
|
|
+ //刀具申请校验处理
|
|
|
+ String isApply = !model.containsKey("isApply") ? "" : model.get("isApply").toString();
|
|
|
|
|
|
OrderTask orderTask = OrderTask.builder().orderId(order.getId())
|
|
|
.hasMaterial("0").isMachine("0").isXbk(isXbk).start(model.get("start").toString()).goal(model.get("goal").toString())
|