fix
This commit is contained in:
psh
@@ -42,17 +42,16 @@ import java.util.Map;
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/pda")
|
||||
@RequestMapping("/mobile/auth")
|
||||
@Api(tags = "手持：系统授权接口")
|
||||
public class MobileAuthorizationController {
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
@Autowired
|
||||
private ISysRoleService roleService;
|
||||
@Autowired
|
||||
private ISchBasePointService pointService;
|
||||
|
||||
@ApiOperation("登录授权")
|
||||
@PostMapping(value = "/handlogin")
|
||||
@PostMapping(value = "/login")
|
||||
@SaIgnore
|
||||
public ResponseEntity<Object> login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
|
||||
// 密码解密 - 前端的加密规则: encrypt（根据实际更改）
|
||||
@@ -97,15 +96,4 @@ public class MobileAuthorizationController {
|
||||
return ResponseEntity.ok(authInfo);
|
||||
}
|
||||
|
||||
@PostMapping("/point")
|
||||
@Log("查询设备编号及状态")
|
||||
@ApiOperation("查询设备编号及状态")
|
||||
@SaIgnore
|
||||
//@PreAuthorize("@el.check('sect:list')")
|
||||
//@RequestBody JSONObject json
|
||||
public ResponseEntity<Object> queryPoint(@RequestBody Map<String, String> whereJson) {
|
||||
SchBasePoint region = new SchBasePoint();
|
||||
region.setRegion_code(whereJson.get("region_code"));
|
||||
return new ResponseEntity<>(pointService.getPointList(region), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,9 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.nl.common.logging.annotation.Log;
|
||||
import org.nl.wms.pda.service.PdaService;
|
||||
import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
|
||||
import org.nl.wms.sch.point.service.ISchBasePointService;
|
||||
import org.nl.wms.sch.point.service.dao.SchBasePoint;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Author: lyd
|
||||
@@ -34,6 +38,20 @@ public class PdaController {
|
||||
|
||||
@Resource
|
||||
private PdaService pdaService;
|
||||
@Autowired
|
||||
private ISchBasePointService pointService;
|
||||
|
||||
@PostMapping("/point")
|
||||
@Log("查询设备编号及状态")
|
||||
@ApiOperation("查询设备编号及状态")
|
||||
@SaIgnore
|
||||
//@PreAuthorize("@el.check('sect:list')")
|
||||
//@RequestBody JSONObject json
|
||||
public ResponseEntity<Object> queryPoint(@RequestBody Map<String, String> whereJson) {
|
||||
SchBasePoint region = new SchBasePoint();
|
||||
region.setRegion_code(whereJson.get("region_code"));
|
||||
return new ResponseEntity<>(pointService.getPointList(region), HttpStatus.OK);
|
||||
}
|
||||
|
||||
@PostMapping("/yclrk")
|
||||
@Log("原材料入库")
|
||||
|
||||
@@ -9,6 +9,6 @@ import lombok.Data;
|
||||
*/
|
||||
@Data
|
||||
public class ForcedRestingDto {
|
||||
private Integer stand_time; // 静置时间
|
||||
private Integer stand_time; // 回温时间(小时)
|
||||
private String group_id; // 组盘标识
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ public class PdmBdWorkorder implements Serializable {
|
||||
@ApiModelProperty(value = "实际结束时间")
|
||||
private String realproduceend_date;
|
||||
|
||||
@ApiModelProperty(value = "静置时间(分钟)")
|
||||
@ApiModelProperty(value = "回温时间(小时)")
|
||||
private Integer standing_time;
|
||||
|
||||
@ApiModelProperty(value = "点位编码")
|
||||
|
||||
@@ -43,7 +43,7 @@ public class PdmBdWorkorderDto implements Serializable {
|
||||
/** 实际结束时间 */
|
||||
private String realproduceend_date;
|
||||
|
||||
/** 静置时间(分钟) */
|
||||
/** 回温时间(小时) */
|
||||
private BigDecimal standing_time;
|
||||
|
||||
/** 点位编码 */
|
||||
|
||||
@@ -56,7 +56,7 @@ public class SchBaseVehiclematerialgroup implements Serializable {
|
||||
@ApiModelProperty(value = "入库时间")
|
||||
private String instorage_time;
|
||||
|
||||
@ApiModelProperty(value = "静置时间(分钟)")
|
||||
@ApiModelProperty(value = "回温时间(小时)")
|
||||
private Integer standing_time;
|
||||
|
||||
@ApiModelProperty(value = "物料数量")
|
||||
|
||||
@@ -42,7 +42,7 @@ public class SchBaseVehiclematerialgroupDto implements Serializable {
|
||||
/** 入库时间 */
|
||||
private String instorage_time;
|
||||
|
||||
/** 静置时间(分钟) */
|
||||
/** 回温时间(小时) */
|
||||
private BigDecimal standing_time;
|
||||
|
||||
/** 物料数量 */
|
||||
|
||||
@@ -171,13 +171,15 @@ public class YCLRKTask extends AbstractTask {
|
||||
pointService.update(endPointObj);
|
||||
// 要把数据存到组盘表 -> 改造公共方法，返回id
|
||||
//组盘表需要关联外部mes晶棒数据，一对多
|
||||
SchBaseVehiclematerialgroup groupEntity = getSchBaseVehiclematerialgroup(taskObj, extGroupData, workorderCode, startPoint, startPointObj);
|
||||
SchBaseVehiclematerialgroup groupEntity = getSchBaseVehiclematerialgroup(taskObj, extGroupData, workorderCode, endPoint, endPointObj);
|
||||
groupEntity.setVehicle_code(taskObj.getVehicle_code());
|
||||
groupEntity.setVehicle_type("0");
|
||||
groupEntity.setMaterial_weight(extGroupData.getBigDecimal("weight"));
|
||||
vehiclematerialgroupService.save(groupEntity);
|
||||
groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
|
||||
groupEntity.setVehicle_code(taskObj.getVehicle_code2());
|
||||
groupEntity.setVehicle_type("1");
|
||||
groupEntity.setMaterial_weight(extGroupData.getBigDecimal("weight"));
|
||||
vehiclematerialgroupService.save(groupEntity);
|
||||
// 任务完成
|
||||
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
FROM
|
||||
`sch_base_point` p
|
||||
WHERE p.region_code like CONCAT('%', #{regionCode}, '%')
|
||||
and p.is_used = #{point_status} and p.is_used = 1
|
||||
and p.point_status = #{point_status} and p.is_used = 1
|
||||
ORDER BY region_code
|
||||
</select>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user