Преглед изворни кода

添加绑定冷板码判断条件

dkk пре 1 дан
родитељ
комит
720b7e8ce6
2 измењених фајлова са 25 додато и 1 уклоњено
  1. 24 0
      src/com/mes/ui/MesClient.java
  2. 1 1
      src/resources/config/config.properties

+ 24 - 0
src/com/mes/ui/MesClient.java

@@ -479,6 +479,30 @@ public class MesClient extends JFrame {
             mesClientFrame.repaint();
             mesClientFrame.repaint();
 
 
             if(work_status == 1){
             if(work_status == 1){
+                // 校验工件码与冷板码版本匹配
+                String snText = product_sn.getText();
+                String lbText = scanBarcode;
+                String snPrefix = snText.length() >= 13 ? snText.substring(0, 13) : snText;
+                String lbPrefix = lbText.length() >= 13 ? lbText.substring(0, 13) : lbText;
+                // 国内版前13位
+                final String SN_DOMESTIC = "5019016600451";
+                final String SN_OVERSEAS  = "5019016600361";
+                final String LB_DOMESTIC = "5099006618051";
+                final String LB_OVERSEAS  = "5099006617551";
+                boolean snIsDomestic = SN_DOMESTIC.equals(snPrefix);
+                boolean snIsOverseas = SN_OVERSEAS.equals(snPrefix);
+                boolean lbIsDomestic = LB_DOMESTIC.equals(lbPrefix);
+                boolean lbIsOverseas = LB_OVERSEAS.equals(lbPrefix);
+                boolean match = (snIsDomestic && lbIsDomestic) || (snIsOverseas && lbIsOverseas);
+                if(!match) {
+                    product_sn_lb.setText("");
+                    mesClientFrame.repaint();
+                    status_menu.setText("冷板码不匹配!");
+                    status_menu.setForeground(Color.RED);
+//
+                    return;
+                }
+
                 String warehouseSn = getBarcode(product_sn_lb.getText());
                 String warehouseSn = getBarcode(product_sn_lb.getText());
                 String sn = getBarcode(product_sn.getText());
                 String sn = getBarcode(product_sn.getText());
                 Boolean ret = DataUtil.bindWarehouse(nettyClient, sn, warehouseSn, user20, "400006");
                 Boolean ret = DataUtil.bindWarehouse(nettyClient, sn, warehouseSn, user20, "400006");

+ 1 - 1
src/resources/config/config.properties

@@ -1,5 +1,5 @@
 # ???
 # ???
-mes.gw=OP230A
+mes.gw=OP220A
 # ???IP
 # ???IP
 mes.server_ip=127.0.0.1
 mes.server_ip=127.0.0.1
 #mes.server_ip=192.168.21.99
 #mes.server_ip=192.168.21.99