Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lsh

1 天以前 506eef53323dddf4fefd2873be1c65942dac19b2

 src/main/java/com/zy/common/web/WcsController.java

@@ -179,7 +179,7 @@
        wrkMast.setIoType(12);
        wrkMast.setCrnNo(3);
        wrkMast.setBarcode(transplantWork.getBarcode());
        wrkMast.setSourceStaNo(1015);
        wrkMast.setSourceStaNo(transplantWork.getSourceStaNo());
        wrkMast.setStaNo(transplantWork.getStaNo());
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料