fix:蓝牙枪内容替换

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/RingScanInformationProdOrderScanningController.java

@@ -0,0 +1,107 @@
+package com.zkqy.amichi.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zkqy.amichi.domain.RingScanInformationProdOrderScanning;
+import com.zkqy.amichi.service.IRingScanInformationProdOrderScanningService;
+
+
+/**
+ * 生产订单扫描记录Controller
+ * 
+ * @author ruoyi
+ * @date 2024-11-19
+ */
+@RestController
+@RequestMapping("/ringScanProdOderScanning/scanning")
+public class RingScanInformationProdOrderScanningController extends BaseController
+{
+    @Autowired
+    private IRingScanInformationProdOrderScanningService ringScanInformationProdOrderScanningService;
+
+    /**
+     * 查询生产订单扫描记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('ringScanProdOderScanning:scanning:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning)
+    {
+        startPage();
+        List<RingScanInformationProdOrderScanning> list = ringScanInformationProdOrderScanningService.selectRingScanInformationProdOrderScanningList(ringScanInformationProdOrderScanning);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出生产订单扫描记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('ringScanProdOderScanning:scanning:export')")
+    @Log(title = "生产订单扫描记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning)
+    {
+        List<RingScanInformationProdOrderScanning> list = ringScanInformationProdOrderScanningService.selectRingScanInformationProdOrderScanningList(ringScanInformationProdOrderScanning);
+        ExcelUtil<RingScanInformationProdOrderScanning> util = new ExcelUtil<RingScanInformationProdOrderScanning>(RingScanInformationProdOrderScanning.class);
+        util.exportExcel(response, list, "生产订单扫描记录数据");
+    }
+
+    /**
+     * 获取生产订单扫描记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('ringScanProdOderScanning:scanning:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(ringScanInformationProdOrderScanningService.selectRingScanInformationProdOrderScanningById(id));
+    }
+
+    /**
+     * 新增生产订单扫描记录
+     */
+    @PreAuthorize("@ss.hasPermi('ringScanProdOderScanning:scanning:add')")
+    @Log(title = "生产订单扫描记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning)
+    {
+        return toAjax(ringScanInformationProdOrderScanningService.insertRingScanInformationProdOrderScanning(ringScanInformationProdOrderScanning));
+    }
+
+    /**
+     * 修改生产订单扫描记录
+     */
+    @PreAuthorize("@ss.hasPermi('ringScanProdOderScanning:scanning:edit')")
+    @Log(title = "生产订单扫描记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning)
+    {
+        return toAjax(ringScanInformationProdOrderScanningService.updateRingScanInformationProdOrderScanning(ringScanInformationProdOrderScanning));
+    }
+
+    /**
+     * 删除生产订单扫描记录
+     */
+    @PreAuthorize("@ss.hasPermi('ringScanProdOderScanning:scanning:remove')")
+    @Log(title = "生产订单扫描记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(ringScanInformationProdOrderScanningService.deleteRingScanInformationProdOrderScanningByIds(ids));
+    }
+}

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/domain/RingScanInformationProdOrderScanning.java

@@ -0,0 +1,116 @@
+package com.zkqy.amichi.domain;
+
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+
+/**
+ * 生产订单扫描记录对象 ring_scan_information_prod_order_scanning
+ * 
+ * @author ruoyi
+ * @date 2024-11-19
+ */
+public class RingScanInformationProdOrderScanning extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 檢驗  */
+    private String inspectionQuantity;
+
+    /**包裝 */
+    private String packingQuantity;
+
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderNumber;
+
+    /** 生产订单号 */
+    @Excel(name = "生产订单号")
+    private String productionOrderNumber;
+
+    /** 1:到包装 2:检验 */
+    @Excel(name = "1:到包装 2:检验")
+    private String toPackagingorinspection;
+
+    /** 生产订单的总数量 */
+    @Excel(name = "生产订单的总数量")
+    private String totalQuantity;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setOrderNumber(String orderNumber) 
+    {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderNumber() 
+    {
+        return orderNumber;
+    }
+    public void setProductionOrderNumber(String productionOrderNumber) 
+    {
+        this.productionOrderNumber = productionOrderNumber;
+    }
+
+    public String getProductionOrderNumber() 
+    {
+        return productionOrderNumber;
+    }
+    public void setToPackagingorinspection(String toPackagingorinspection) 
+    {
+        this.toPackagingorinspection = toPackagingorinspection;
+    }
+
+    public String getInspectionQuantity() {
+        return inspectionQuantity;
+    }
+
+    public void setInspectionQuantity(String inspectionQuantity) {
+        this.inspectionQuantity = inspectionQuantity;
+    }
+
+    public String getPackingQuantity() {
+        return packingQuantity;
+    }
+
+    public void setPackingQuantity(String packingQuantity) {
+        this.packingQuantity = packingQuantity;
+    }
+    public String getToPackagingorinspection() 
+    {
+        return toPackagingorinspection;
+    }
+    public void setTotalQuantity(String totalQuantity) 
+    {
+        this.totalQuantity = totalQuantity;
+    }
+
+    public String getTotalQuantity() 
+    {
+        return totalQuantity;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("orderNumber", getOrderNumber())
+            .append("productionOrderNumber", getProductionOrderNumber())
+            .append("toPackagingorinspection", getToPackagingorinspection())
+            .append("totalQuantity", getTotalQuantity())
+            .toString();
+    }
+}

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/RingScanInformationProdOrderScanningMapper.java

@@ -0,0 +1,63 @@
+package com.zkqy.amichi.mapper;
+
+import java.util.List;
+import com.zkqy.amichi.domain.RingScanInformationProdOrderScanning;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 生产订单扫描记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-19
+ */
+@Mapper
+public interface RingScanInformationProdOrderScanningMapper 
+{
+    /**
+     * 查询生产订单扫描记录
+     * 
+     * @param id 生产订单扫描记录主键
+     * @return 生产订单扫描记录
+     */
+    public RingScanInformationProdOrderScanning selectRingScanInformationProdOrderScanningById(Long id);
+
+    /**
+     * 查询生产订单扫描记录列表
+     * 
+     * @param ringScanInformationProdOrderScanning 生产订单扫描记录
+     * @return 生产订单扫描记录集合
+     */
+    public List<RingScanInformationProdOrderScanning> selectRingScanInformationProdOrderScanningList(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning);
+
+    /**
+     * 新增生产订单扫描记录
+     * 
+     * @param ringScanInformationProdOrderScanning 生产订单扫描记录
+     * @return 结果
+     */
+    public int insertRingScanInformationProdOrderScanning(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning);
+
+    /**
+     * 修改生产订单扫描记录
+     * 
+     * @param ringScanInformationProdOrderScanning 生产订单扫描记录
+     * @return 结果
+     */
+    public int updateRingScanInformationProdOrderScanning(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning);
+
+    /**
+     * 删除生产订单扫描记录
+     * 
+     * @param id 生产订单扫描记录主键
+     * @return 结果
+     */
+    public int deleteRingScanInformationProdOrderScanningById(Long id);
+
+    /**
+     * 批量删除生产订单扫描记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRingScanInformationProdOrderScanningByIds(Long[] ids);
+}

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IRingScanInformationProdOrderScanningService.java

@@ -0,0 +1,61 @@
+package com.zkqy.amichi.service;
+
+import java.util.List;
+import com.zkqy.amichi.domain.RingScanInformationProdOrderScanning;
+
+/**
+ * 生产订单扫描记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-11-19
+ */
+public interface IRingScanInformationProdOrderScanningService 
+{
+    /**
+     * 查询生产订单扫描记录
+     * 
+     * @param id 生产订单扫描记录主键
+     * @return 生产订单扫描记录
+     */
+    public RingScanInformationProdOrderScanning selectRingScanInformationProdOrderScanningById(Long id);
+
+    /**
+     * 查询生产订单扫描记录列表
+     * 
+     * @param ringScanInformationProdOrderScanning 生产订单扫描记录
+     * @return 生产订单扫描记录集合
+     */
+    public List<RingScanInformationProdOrderScanning> selectRingScanInformationProdOrderScanningList(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning);
+
+    /**
+     * 新增生产订单扫描记录
+     * 
+     * @param ringScanInformationProdOrderScanning 生产订单扫描记录
+     * @return 结果
+     */
+    public int insertRingScanInformationProdOrderScanning(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning);
+
+    /**
+     * 修改生产订单扫描记录
+     * 
+     * @param ringScanInformationProdOrderScanning 生产订单扫描记录
+     * @return 结果
+     */
+    public int updateRingScanInformationProdOrderScanning(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning);
+
+    /**
+     * 批量删除生产订单扫描记录
+     * 
+     * @param ids 需要删除的生产订单扫描记录主键集合
+     * @return 结果
+     */
+    public int deleteRingScanInformationProdOrderScanningByIds(Long[] ids);
+
+    /**
+     * 删除生产订单扫描记录信息
+     * 
+     * @param id 生产订单扫描记录主键
+     * @return 结果
+     */
+    public int deleteRingScanInformationProdOrderScanningById(Long id);
+}

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/RingScanInformationProdOrderScanningServiceImpl.java

@@ -0,0 +1,93 @@
+package com.zkqy.amichi.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zkqy.amichi.mapper.RingScanInformationProdOrderScanningMapper;
+import com.zkqy.amichi.domain.RingScanInformationProdOrderScanning;
+import com.zkqy.amichi.service.IRingScanInformationProdOrderScanningService;
+
+/**
+ * 生产订单扫描记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-11-19
+ */
+@Service
+public class RingScanInformationProdOrderScanningServiceImpl implements IRingScanInformationProdOrderScanningService 
+{
+    @Autowired
+    private RingScanInformationProdOrderScanningMapper ringScanInformationProdOrderScanningMapper;
+
+    /**
+     * 查询生产订单扫描记录
+     * 
+     * @param id 生产订单扫描记录主键
+     * @return 生产订单扫描记录
+     */
+    @Override
+    public RingScanInformationProdOrderScanning selectRingScanInformationProdOrderScanningById(Long id)
+    {
+        return ringScanInformationProdOrderScanningMapper.selectRingScanInformationProdOrderScanningById(id);
+    }
+
+    /**
+     * 查询生产订单扫描记录列表
+     * 
+     * @param ringScanInformationProdOrderScanning 生产订单扫描记录
+     * @return 生产订单扫描记录
+     */
+    @Override
+    public List<RingScanInformationProdOrderScanning> selectRingScanInformationProdOrderScanningList(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning)
+    {
+        return ringScanInformationProdOrderScanningMapper.selectRingScanInformationProdOrderScanningList(ringScanInformationProdOrderScanning);
+    }
+
+    /**
+     * 新增生产订单扫描记录
+     * 
+     * @param ringScanInformationProdOrderScanning 生产订单扫描记录
+     * @return 结果
+     */
+    @Override
+    public int insertRingScanInformationProdOrderScanning(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning)
+    {
+        return ringScanInformationProdOrderScanningMapper.insertRingScanInformationProdOrderScanning(ringScanInformationProdOrderScanning);
+    }
+
+    /**
+     * 修改生产订单扫描记录
+     * 
+     * @param ringScanInformationProdOrderScanning 生产订单扫描记录
+     * @return 结果
+     */
+    @Override
+    public int updateRingScanInformationProdOrderScanning(RingScanInformationProdOrderScanning ringScanInformationProdOrderScanning)
+    {
+        return ringScanInformationProdOrderScanningMapper.updateRingScanInformationProdOrderScanning(ringScanInformationProdOrderScanning);
+    }
+
+    /**
+     * 批量删除生产订单扫描记录
+     * 
+     * @param ids 需要删除的生产订单扫描记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRingScanInformationProdOrderScanningByIds(Long[] ids)
+    {
+        return ringScanInformationProdOrderScanningMapper.deleteRingScanInformationProdOrderScanningByIds(ids);
+    }
+
+    /**
+     * 删除生产订单扫描记录信息
+     * 
+     * @param id 生产订单扫描记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRingScanInformationProdOrderScanningById(Long id)
+    {
+        return ringScanInformationProdOrderScanningMapper.deleteRingScanInformationProdOrderScanningById(id);
+    }
+}

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/StationInformationServiceImpl.java

@@ -78,6 +78,10 @@ public class StationInformationServiceImpl implements IStationInformationService
     @Autowired
     private  RingTerminalMapper ringTerminalMapper;
 
+    @Autowired
+    private  RingScanInformationProdOrderScanningMapper prodOrderScanningMapper;
+
+
     public static void main(String[] args) {
        String aaa="scan@&GWM-001&SMSB001";
         boolean contains = aaa.contains("scan@");
@@ -577,6 +581,7 @@ public class StationInformationServiceImpl implements IStationInformationService
                 RingScanInformationFirst ringScanInformationFirst=new RingScanInformationFirst();
                 ringScanInformationFirst.setOrderNumber(ringScanInformation.getOrderNumber());
                 List<RingScanInformationFirst> ringScanInformationFirsts = ringScanInformationFirstMapper.selectRingScanInformationFirstList(ringScanInformationFirst);
+                //订单扫描记录
                 if(ringScanInformationFirsts.size()<=0){
                     ringScanInformationFirst.setProductionOrderNumber(ringScanInformation.getProductionOrderNumber());
                     ringScanInformationFirst.setStatus("1");
@@ -585,7 +590,7 @@ public class StationInformationServiceImpl implements IStationInformationService
                     String sa="{\n" +
                             "    \"FormId\": \"SAL_SaleOrder\",\n" +
                             "    \"FieldKeys\": \"FBillNo,FQty\",\n" +
-                            "    \"FilterString\": [{\"Left\":\"\",\"FieldName\":\"FBillNo\",\"Compare\":\"17\",\"Value\":\""+ringScanInformation.getOrderNumber()+"+\",\"Right\":\"\",\"Logic\":0}],\n" +
+                            "    \"FilterString\": [{\"Left\":\"\",\"FieldName\":\"FBillNo\",\"Compare\":\"17\",\"Value\":\""+ringScanInformation.getOrderNumber()+"\",\"Right\":\"\",\"Logic\":0}],\n" +
                             "    \"OrderString\": \"\",\n" +
                             "    \"TopRowCount\": 0,\n" +
                             "    \"StartRow\": 0,\n" +
@@ -600,28 +605,78 @@ public class StationInformationServiceImpl implements IStationInformationService
                         throw new RuntimeException(e);
                     }
                     List<Map> mapListTotal = JSON.parseArray(resultJsonTotal, Map.class);
+                    if(mapListTotal.size()<=0){
+                        return "扫码失败订单已关闭";
+                    }
                     Double totalAmount = mapListTotal.stream()
                             .filter(map1 -> map1.containsKey("FQty")) // 确保 map 中包含 "amount" 字段
                             .mapToDouble(map1 -> ((Number) map1.get("FQty")).doubleValue()) // 将 "amount" 字段转换为 double
                             .sum(); // 求和
+
                     ringScanInformationFirst.setTotalQuantity(String.valueOf(totalAmount.intValue()));
+                    //第一次扫码记录订单扫描记录信息
                     int i = ringScanInformationFirstMapper.insertRingScanInformationFirst(ringScanInformationFirst);
                 }
-            }
-            //第一次这个订单就敲定---有多少是到包装,有多少是到喷漆,
-            if(ringScanInformation.getPersonnelName().equals("包装")){//人在包装节点
-                //更新第一次记录的日志信息记录表
+                //先查生产订单日志表没有在查询在新增
+                RingScanInformationProdOrderScanning prodOrderScanning=new RingScanInformationProdOrderScanning();
+                prodOrderScanning.setOrderNumber(ringScanInformation.getOrderNumber());
+                prodOrderScanning.setProductionOrderNumber(ringScanInformation.getProductionOrderNumber());
+                List<RingScanInformationProdOrderScanning> ringScanInformationProdOrderScannings =
+                        prodOrderScanningMapper.selectRingScanInformationProdOrderScanningList(prodOrderScanning);
+                if(ringScanInformationProdOrderScannings.size()<0){
+                    //看看这个生产订单包装节点Or
+                    String query="{\n" +
+                            "    \"FormId\": \"PRD_MO\",\n" +
+                            "    \"FieldKeys\": \"FMaterialId.FNumber\",\n" +
+                            "    \"FilterString\": [{\"Left\":\"\",\"FieldName\":\"FBillNo\",\"Compare\":\"67\",\"Value\":\""+ringScanInformation.getProductionOrderNumber()+"\",\"Right\":\"\",\"Logic\":0}],\n" +
+                            "    \"OrderString\": \"\",\n" +
+                            "    \"TopRowCount\": 0,\n" +
+                            "    \"StartRow\": 0,\n" +
+                            "    \"Limit\": 2000,\n" +
+                            "    \"SubSystemId\": \"\"\n" +
+                            "}";
+                    Map<String, Object> prodListQuery = JSON.parseObject(query, Map.class);
+                    String prodListQueryJson = null;
+                    try {
+                        prodListQueryJson = api.billQuery(JSON.toJSONString(prodListQuery));
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                    List<Map> prodListQueryJsonList = JSON.parseArray(prodListQueryJson, Map.class);
+                    //如果ERP存在这个生产订单
+                    if(prodListQueryJsonList.size()>0){
+                        //[{"FMaterialId.FNumber":"1010040050034","FQty":2.0000000000}]
+                        //生产订单日志记录
+                        prodOrderScanning.setTotalQuantity(prodListQueryJsonList.get(0).get("FQty").toString());//数量
+                        if(prodListQueryJsonList.get(0).get("FMaterialId.FNumber").toString().startsWith("1")){
+                            prodOrderScanning.setToPackagingorinspection("1");//到包装
+                        }else if(prodListQueryJsonList.get(0).get("FMaterialId.FNumber").toString().startsWith("2")){
+                            prodOrderScanning.setToPackagingorinspection("2");//到入库
+                        }else {
+                            prodOrderScanning.setToPackagingorinspection("0");//其他
+                        }
+                        int i = prodOrderScanningMapper.insertRingScanInformationProdOrderScanning(prodOrderScanning);
+                        if(i>0){
+                            System.out.println("新增生产订单日志信息成功");
+                        }
+                    }
+                }
             }
             int i2 = ringScanInformationMapper.insertRingScanInformation(ringScanInformation);
             if(i2>0){
                 //最后一个节点判定逻辑
-                //判断此次订单内容扫码,当前订单存在不存在于第一次扫描的表中
-                RingScanInformationFirst ringScanInformationFirst=new RingScanInformationFirst();
-                ringScanInformationFirst.setOrderNumber(ringScanInformation.getOrderNumber());
-                List<RingScanInformationFirst> ringScanInformationFirsts = ringScanInformationFirstMapper.selectRingScanInformationFirstList(ringScanInformationFirst);
-                if(ringScanInformationFirsts.size()>0){//不是新扫的订单,可以开始校验包装节点是否满足入库条件了
-                    //原先是包装扫码,包装节点的数量等于了需要入库的数量
-                    //我录入包装包装数据的时候
+                RingScanInformationProdOrderScanning prodOrderScanning=new RingScanInformationProdOrderScanning();
+                prodOrderScanning.setOrderNumber(ringScanInformation.getOrderNumber());
+                prodOrderScanning.setProductionOrderNumber(ringScanInformation.getProductionOrderNumber());
+                List<RingScanInformationProdOrderScanning> ringScanInformationProdOrderScannings =
+                        prodOrderScanningMapper.selectRingScanInformationProdOrderScanningList(prodOrderScanning);
+                if(ringScanInformationProdOrderScannings.size()>0){
+                    //得到
+                    String toPackagingorinspection = ringScanInformationProdOrderScannings.get(0).getToPackagingorinspection();
+                    if(toPackagingorinspection.equals("1")){//判断完是到包装还是到检验
+                        //更新检验或者入库数量
+                        //
+                    }
                 }
                 return "扫描成功";
             }else {
@@ -629,9 +684,8 @@ public class StationInformationServiceImpl implements IStationInformationService
             }
         }
         return "扫描成功";
-    }
+    };
 
-    ;
     /**
      * 指环王扫描信息hmc
      * @param stationProductScanningRingVo
@@ -651,7 +705,6 @@ public class StationInformationServiceImpl implements IStationInformationService
             String[] split = deviceNumberAndName.split("-");
             String deviceNumber=split[0];
             String deviceName=split[1];
-
             String scanningTime = stationProductScanningRingVo.getScanningTime();//扫描时间
            //先获取到当前设备上次的扫描时间
 //            RingScanInformation ringScanInformationQuery=new RingScanInformation();

zkqy-fujian-amichi/src/main/resources/mapper/RingScanInformationProdOrderScanningMapper.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zkqy.amichi.mapper.RingScanInformationProdOrderScanningMapper">
+    
+    <resultMap type="com.zkqy.amichi.domain.RingScanInformationProdOrderScanning" id="RingScanInformationProdOrderScanningResult">
+        <result property="id"    column="id"    />
+        <result property="orderNumber"    column="order_number"    />
+        <result property="productionOrderNumber"    column="production_order_number"    />
+        <result property="toPackagingorinspection"    column="to_packagingOrinspection"    />
+        <result property="totalQuantity"    column="total_quantity"    />
+        <result property="packingQuantity"    column="packing_quantity"    />
+        <result property="inspectionQuantity"    column="inspection_quantity"    />
+
+    </resultMap>
+
+    <sql id="selectRingScanInformationProdOrderScanningVo">
+        select id, order_number, production_order_number, to_packagingOrinspection, total_quantity,packing_quantity,inspection_quantity from fjqydb.ring_scan_information_prod_order_scanning
+    </sql>
+
+    <select id="selectRingScanInformationProdOrderScanningList" parameterType="com.zkqy.amichi.domain.RingScanInformationProdOrderScanning" resultMap="RingScanInformationProdOrderScanningResult">
+        <include refid="selectRingScanInformationProdOrderScanningVo"/>
+        <where>  
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="productionOrderNumber != null  and productionOrderNumber != ''"> and production_order_number = #{productionOrderNumber}</if>
+            <if test="toPackagingorinspection != null  and toPackagingorinspection != ''"> and to_packagingOrinspection = #{toPackagingorinspection}</if>
+            <if test="totalQuantity != null  and totalQuantity != ''"> and total_quantity = #{totalQuantity}</if>
+        </where>
+    </select>
+    
+    <select id="selectRingScanInformationProdOrderScanningById" parameterType="Long" resultMap="RingScanInformationProdOrderScanningResult">
+        <include refid="selectRingScanInformationProdOrderScanningVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertRingScanInformationProdOrderScanning" parameterType="com.zkqy.amichi.domain.RingScanInformationProdOrderScanning" useGeneratedKeys="true" keyProperty="id">
+        insert into fjqydb.ring_scan_information_prod_order_scanning
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null">order_number,</if>
+            <if test="productionOrderNumber != null">production_order_number,</if>
+            <if test="toPackagingorinspection != null">to_packagingOrinspection,</if>
+            <if test="totalQuantity != null">total_quantity,</if>
+            <if test="packingQuantity != null">packing_quantity,</if>
+            <if test="inspectionQuantity != null">inspection_quantity,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null">#{orderNumber},</if>
+            <if test="productionOrderNumber != null">#{productionOrderNumber},</if>
+            <if test="toPackagingorinspection != null">#{toPackagingorinspection},</if>
+            <if test="totalQuantity != null">#{totalQuantity},</if>
+            <if test="packingQuantity != null">#{packingQuantity},</if>
+            <if test="inspectionQuantity != null">#{inspectionQuantity},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRingScanInformationProdOrderScanning" parameterType="com.zkqy.amichi.domain.RingScanInformationProdOrderScanning">
+        update fjqydb.ring_scan_information_prod_order_scanning
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNumber != null">order_number = #{orderNumber},</if>
+            <if test="productionOrderNumber != null">production_order_number = #{productionOrderNumber},</if>
+            <if test="toPackagingorinspection != null">to_packagingOrinspection = #{toPackagingorinspection},</if>
+            <if test="totalQuantity != null">total_quantity = #{totalQuantity},</if>
+            <if test="packingQuantity != null">packing_quantity=#{packingQuantity},</if>
+            <if test="inspectionQuantity != null">inspection_quantity=#{inspectionQuantity},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRingScanInformationProdOrderScanningById" parameterType="Long">
+        delete from fjqydb.ring_scan_information_prod_order_scanning where id = #{id}
+    </delete>
+
+    <delete id="deleteRingScanInformationProdOrderScanningByIds" parameterType="String">
+        delete from fjqydb.ring_scan_information_prod_order_scanning where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>