zy-asrs.git - Gitblit

			@@ -6,6 +6,7 @@
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.TestMast;
			import com.zy.asrs.entity.param.*;
			import com.zy.asrs.service.ApiLogService;
			import com.zy.asrs.service.OpenService;
			import com.zy.common.model.DetlDto;
			import com.zy.common.web.BaseController;
			@@ -31,6 +32,8 @@

			@Autowired
			private OpenService openService;
			@Autowired
			private ApiLogService apiLogService;

			@PostMapping("/order/matSync/default/v1")
			@AppAuth(memo = "商品信息同步接口")
			@@ -227,6 +230,7 @@
			public synchronized R combPack(@RequestHeader(required = false) String appkey,
			@RequestBody(required = false) CombParam param,
			HttpServletRequest request){
			appkey="ea1f0459efc02a79f046f982767939ae";
			auth(appkey, param, request);
			if (Cools.isEmpty(param)) {
			return R.parse(BaseRes.PARAM);
			@@ -235,6 +239,18 @@
			openService.combPACK(param);

			Map<String,Boolean> map=new HashMap<>();
			apiLogService.save(
			"mes申请入库",
			"172.28.15.251",
			null,
			"127.0.0.1",
			JSON.toJSONString("PackNo:"+param.getPackNo()
			+" PackName:"+param.getPackName()
			+" RequestTime:"+param.getRequestTime()
			+" SettingTimes:"+param.getSettingTimes()),
			"172.28.15.251",
			true
			);
			map.put("isComplete",true);
			return R.ok(map);
			}

			@@ -70,7 +70,7 @@
			select * from asr_wrk_mast
			where wrk_sts=5
			or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
			or (wrk_sts=15 and dateadd(mi,1,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
			or (wrk_sts=15 and dateadd(mi,3,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
			or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
			order by io_time,wrk_no asc
			</select>

			@@ -21,7 +21,7 @@
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off">
			<input class="layui-input" type="text" name="zpallet" placeholder="PACK码" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">

	src/main/java/com/zy/asrs/controller/OpenController.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/WrkMastMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/locDetl/locDetl.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史