Merge branch 'master' into cnas

zss

2024-12-06 a016e3f59d1b2227cd22aeb82090b82d487c8235

 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java

@@ -54,10 +54,10 @@
    int deleteInsContext(InsProductResultVo insProductResultVo);

    //扫码报检(入库)
    int scanInsOrderState(String sonLaboratory, String sampleCode,String trees);
    int scanInsOrderState(String sonLaboratory, String sampleCode,String trees,String entrustCode);

    //扫码出库
    int outInsOrderState(String sonLaboratory, String sampleCode);
    int outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode);

    List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId);

@@ -65,4 +65,5 @@
    Object preview(Integer id) throws Exception;

    int saveInsContext3(InsProductResult insProductResult);

}