高压标识

src/com/jiaju/activity/PieceActivity.java

@@ -2139,6 +2139,10 @@ public class PieceActivity extends Activity {
 							String publicBodyFlag = object1.optString("out_ispublicbody");
 							String trademarkName = object1.optString("out_logoName");
 							String out_MaterialCode = object1.optString("out_MaterialCode");
+							// 20251205 高压标识
+							String goodsLineType = object1.optString("goodsLineType");
+							piece.setGoodsLineType(goodsLineType);
+							
 							piece.setOutMaterialCode(out_MaterialCode);
 							piece.setTrademarkName(trademarkName);
 							piece.setGroutingUserCode(groutingcode);
@@ -2215,8 +2219,11 @@ public class PieceActivity extends Activity {
 								String outMaterialCode = p2.getOutMaterialCode();
 								String orginalGoodsModelForCheck = p2.getGoodsModel();
 								String originalGoodsCode = p2.getGoodsCode();
+								// 20251205 高压标识
+								String orginalgoodsLineType = p2.getGoodsLineType();
+								
 								// if (spm_011.equals("1")) {
-								if (!out_MaterialCode.equals(outMaterialCode)) {
+								if (!out_MaterialCode.equals(outMaterialCode)) {									
 									Bundle bundle = new Bundle();
 									bundle.putInt("Status", 0);
 									bundle.putString("Message", "此产品【" + outbarcode + "】的物料编码【" + out_MaterialCode
@@ -2227,6 +2234,18 @@ public class PieceActivity extends Activity {
 									exceptionHandler.sendMessage(msg);
 									return;
 								}
+//								20251205 高压标识
+								if (!goodsLineType.equals(orginalgoodsLineType)) {									
+									Bundle bundle = new Bundle();
+									bundle.putInt("Status", 0);
+									bundle.putString("Message", "此产品【" + outbarcode + "】的成型工艺【" + ("1".equals(goodsLineType)?"高压":"微压")
+											+ "】与此批次成型工艺【" + ("1".equals(orginalgoodsLineType)?"高压":"微压") + "】不同，不能进行该操作。");
+									Message msg = new Message();
+									msg.what = 2;
+									msg.setData(bundle);
+									exceptionHandler.sendMessage(msg);
+									return;
+								}
 								// }
 //				if (spm_012.equals("1")) {
 //				    if (!goodsModelForCheck.equals(orginalGoodsModelForCheck)) {

src/com/jiaju/model/Piece.java

@@ -25,6 +25,8 @@ public class Piece implements Serializable {
     private String mouldNo;
 
     private int groutingNum;
+    
+    private String goodsLineType;
 
     private String userCode;
 
@@ -37,7 +39,15 @@ public class Piece implements Serializable {
     private String logoId;
     private String outMaterialCode;
 
-    public String getOutMaterialCode() {
+    public String getGoodsLineType() {
+		return goodsLineType;
+	}
+
+	public void setGoodsLineType(String goodsLineType) {
+		this.goodsLineType = goodsLineType;
+	}
+
+	public String getOutMaterialCode() {
 	return outMaterialCode;
     }