pda生产退库优化

src/main/java/com/heai/modules/app/controller/PdaOrderController.java

@@ -61,8 +61,8 @@ public class PdaOrderController {
         return R.ok().put("row", shopOrder);
     }
     @PostMapping("/getShopOrderForReturn")
-    public R getShopOrderForReturn(@RequestBody DailyPlanInData dailyPlanInData){
-        ShopOrderData shopOrder = dailyPlanService.getShopOrderForReturn(dailyPlanInData);
+    public R getShopOrderForReturn(@RequestBody ShopOrderForReturnScanData scanData) {
+        ShopOrderData shopOrder = dailyPlanService.getShopOrderForReturnByScan(scanData);
         return R.ok().put("row", shopOrder);
     }
     /**

src/main/java/com/heai/modules/production/entity/ShopOrderForReturnScanData.java

@@ -0,0 +1,19 @@
+package com.heai.modules.production.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 生产退库：扫派工单/混炼任务单统一入口 - rqrq
+ *
+ * @author rqrq
+ */
+@Data
+public class ShopOrderForReturnScanData implements Serializable {
+
+    /**
+     * 扫到的内容：纯数字为派工单 SeqNo；HL 开头为混炼任务单（待扩展）
+     */
+    private String orderStr;
+}

src/main/java/com/heai/modules/production/service/DailyPlanService.java

@@ -214,6 +214,11 @@ public interface DailyPlanService  {
     ShopOrderData getShopOrder(DailyPlanInData dailyPlanInData);
     ShopOrderData getShopOrderForReturn(DailyPlanInData dailyPlanInData);
 
+    /**
+     * @Description PDA 生产退库：orderStr 为数字走派工单，HL 开头走混炼（待实现）- rqrq
+     */
+    ShopOrderData getShopOrderForReturnByScan(ShopOrderForReturnScanData scan);
+
     /**
      * @Method getShopOrderForHunlianTask
      * @Description: 获取生产订单信息（混炼任务单）

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -868,6 +868,46 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             return new ShopOrderData();
         }
     }
+
+    /**
+     * @Description PDA 生产退库扫码：纯数字→派工单 SeqNo；HL 开头→混炼任务单 TaskNo 查 Hunlian_TaskHeader.orderRef1 再走生产订单 - rqrq
+     */
+    @Override
+    public ShopOrderData getShopOrderForReturnByScan(ShopOrderForReturnScanData scan) {
+        if (scan == null || !StringUtils.hasText(scan.getOrderStr())) {
+            throw new RuntimeException("扫描内容不能为空");
+        }
+        String raw = scan.getOrderStr().trim();
+        if (isAllDigitsDispatchOrder(raw)) {
+            DailyPlanInData dailyPlanInData = new DailyPlanInData();
+            try {
+                dailyPlanInData.setSeqNo(Integer.parseInt(raw));
+            } catch (NumberFormatException e) {
+                throw new RuntimeException("派工单号格式错误");
+            }
+            dailyPlanInData.setRemark("生产退库");
+            return getShopOrderForReturn(dailyPlanInData);
+        }
+        if (raw.toUpperCase().startsWith("HL")) {
+            HunlianData hl = new HunlianData();
+            hl.setTaskNo(raw);
+            return getShopOrderForHunlianTask(hl);
+        }
+
+        throw new RuntimeException("只能扫派工单和混炼任务单二维码");
+    }
+
+    private static boolean isAllDigitsDispatchOrder(String s) {
+        if (s == null || s.length() == 0) {
+            return false;
+        }
+        for (int i = 0; i < s.length(); i++) {
+            if (!Character.isDigit(s.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
     @Override
     public ShopOrderData getShopOrderForHunlianTask(HunlianData inData) {
         List<HunlianData> getHunlianTaskHeader =dailyPlanMapper.getHunlianTaskHeader(inData);

src/main/resources/static/js/pdaOther/productionReturnStep1.js

@@ -36,12 +36,11 @@ $("#orderNo_search").bind("keydown", function (event) {
 function getOrderNoData () {
 	var orderNoSearch = $("#orderNo_search").val();
 	if (orderNoSearch == null || orderNoSearch === "") {
-		layer.msg("请输入派工单号！");
+		layer.msg("请扫描二维码！");
 		return false;
 	}
 	var jsonData = {
-		seqNo: orderNoSearch,
-		remark: "生产退库"
+		orderStr: orderNoSearch
 	};
 	$.ajax({
 		url: "/pdaOrder/getShopOrderForReturn",

src/main/resources/templates/pdaOther/productionReturnStep1.ftl

@@ -68,7 +68,7 @@
 
 	<!-- rqrq - 与 productionIssue.ftl 一致：校验派工单 -->
 	<div autocomplete="off"  style="margin-left: 15px;width: 120px;height: 24px;margin-top: -10px;">
-		<label class="ivu-form-item-label" >请扫描派工单号</label>
+		<label class="ivu-form-item-label" >请扫描二维码</label>
 	</div>
 
 	<div autocomplete="off"  style="width: 260px;margin-left: 25px;height: 24px;margin-top: -5px;">